You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2007/04/03 08:05:20 UTC
svn commit: r525046 - in
/webservices/axis2/trunk/c/modules/core/transport/http/sender:
http_sender.c libcurl/axis2_libcurl.c libcurl/libcurl_stream.c
Author: dinesh
Date: Mon Apr 2 23:05:20 2007
New Revision: 525046
URL: http://svn.apache.org/viewvc?view=rev&rev=525046
Log:
fixed build break with libcurl.
Modified:
webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c
webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.c
webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/libcurl_stream.c
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c?view=diff&rev=525046&r1=525045&r2=525046
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c Mon Apr 2 23:05:20 2007
@@ -61,6 +61,7 @@
is_safe_or_unreserve (
char c);
+#ifndef AXIS2_LIBCURL_ENABLED
static axis2_status_t
axis2_http_sender_configure_proxy(
axis2_http_sender_t *sender,
@@ -78,6 +79,7 @@
axis2_http_sender_t *sender,
const axutil_env_t *env,
axis2_msg_ctx_t *msg_ctx);
+#endif
AXIS2_EXTERN axis2_http_sender_t *AXIS2_CALL
axis2_http_sender_create(
@@ -140,7 +142,7 @@
const axis2_char_t *soap_action)
{
#ifdef AXIS2_LIBCURL_ENABLED
- axis2_libcurl_http_send(sender, env, msg_ctx, output, url,soap_action);
+ return axis2_libcurl_http_send(sender, env, msg_ctx, out, str_url,soap_action);
#else
axis2_http_simple_request_t *request = NULL;
@@ -799,6 +801,7 @@
return AXIS2_SUCCESS;
}
+#ifndef AXIS2_LIBCURL_ENABLED
static axis2_status_t
axis2_http_sender_configure_proxy(
axis2_http_sender_t *sender,
@@ -917,7 +920,9 @@
}
return AXIS2_SUCCESS;
}
+#endif
+#ifndef AXIS2_LIBCURL_ENABLED
static axis2_status_t
axis2_http_sender_configure_server_cert(
axis2_http_sender_t *sender,
@@ -958,7 +963,10 @@
return status;
}
+#endif
+
+#ifndef AXIS2_LIBCURL_ENABLED
static axis2_status_t
axis2_http_sender_configure_key_file(
axis2_http_sender_t *sender,
@@ -999,6 +1007,7 @@
return status;
}
+#endif
#ifdef AXIS2_LIBCURL_ENABLED
AXIS2_EXTERN axis2_status_t AXIS2_CALL
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.c?view=diff&rev=525046&r1=525045&r2=525046
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.c Mon Apr 2 23:05:20 2007
@@ -178,7 +178,7 @@
else
{
headers = curl_slist_append (headers,
- axis2_stracat (env, soap_action_header, soap_action,env));
+ axis2_stracat (env, soap_action_header, soap_action));
}
}
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/libcurl_stream.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/libcurl_stream.c?view=diff&rev=525046&r1=525045&r2=525046
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/libcurl_stream.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/libcurl_stream.c Mon Apr 2 23:05:20 2007
@@ -14,7 +14,7 @@
#define AXIS2_INTF_TO_IMPL(stream) ((libcurl_stream_impl_t *)(stream))
/********************************Function headers******************************/
-axis2_status_t AXIS2_CALL
+void AXIS2_CALL
libcurl_stream_free(
axutil_stream_t *stream,
const axutil_env_t *env);
@@ -77,9 +77,9 @@
stream_impl->read_len = 0;
stream_impl->stream_type = AXIS2_STREAM_MANAGED;
- axutil_stream_set_read(stream_impl, env, libcurl_stream_read);
- axutil_stream_set_write(stream_impl, env, libcurl_stream_write);
- axutil_stream_set_skip(stream_impl, env, libcurl_stream_skip);
+ axutil_stream_set_read(&(stream_impl->stream), env, libcurl_stream_read);
+ axutil_stream_set_write(&(stream_impl->stream), env, libcurl_stream_write);
+ axutil_stream_set_skip(&(stream_impl->stream), env, libcurl_stream_skip);
return &(stream_impl->stream);
}
@@ -137,7 +137,8 @@
{
if (buffer && (stream_impl->size > stream_impl->read_len))
{
- memcpy (buffer, &stream_impl->buffer[stream_impl->read_len], stream_impl->size - stream_impl->read_len);
+ memcpy (buffer, &stream_impl->buffer[stream_impl->read_len],
+ stream_impl->size - stream_impl->read_len);
read = stream_impl->size - stream_impl->read_len;
stream_impl->read_len += read;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org