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 sa...@apache.org on 2007/06/26 10:29:59 UTC
svn commit: r550737 - in /webservices/axis2/trunk/c:
include/axis2_http_transport.h src/core/transport/http/common/http_worker.c
src/core/transport/http/server/simple_axis2_server/http_server_main.c
src/core/transport/http/util/http_transport_utils.c
Author: sahan
Date: Tue Jun 26 01:29:58 2007
New Revision: 550737
URL: http://svn.apache.org/viewvc?view=rev&rev=550737
Log:
Some formatting and sending the content-type in services html
Modified:
webservices/axis2/trunk/c/include/axis2_http_transport.h
webservices/axis2/trunk/c/src/core/transport/http/common/http_worker.c
webservices/axis2/trunk/c/src/core/transport/http/server/simple_axis2_server/http_server_main.c
webservices/axis2/trunk/c/src/core/transport/http/util/http_transport_utils.c
Modified: webservices/axis2/trunk/c/include/axis2_http_transport.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_http_transport.h?view=diff&rev=550737&r1=550736&r2=550737
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_http_transport.h (original)
+++ webservices/axis2/trunk/c/include/axis2_http_transport.h Tue Jun 26 01:29:58 2007
@@ -274,9 +274,14 @@
#define AXIS2_HTTP_HEADER_ACCEPT_TEXT_ALL "text/*"
/**
- * HEADER_ACCEPT_TEXT_ALL
+ * HEADER_ACCEPT_TEXT_PLAIN
*/
#define AXIS2_HTTP_HEADER_ACCEPT_TEXT_PLAIN "text/plain"
+
+/**
+ * HEADER_ACCEPT_TEXT_HTML
+ */
+#define AXIS2_HTTP_HEADER_ACCEPT_TEXT_HTML "text/html"
/**
* HEADER_ACCEPT_TEXT_XML
Modified: webservices/axis2/trunk/c/src/core/transport/http/common/http_worker.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/http/common/http_worker.c?view=diff&rev=550737&r1=550736&r2=550737
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/http/common/http_worker.c (original)
+++ webservices/axis2/trunk/c/src/core/transport/http/common/http_worker.c Tue Jun 26 01:29:58 2007
@@ -261,6 +261,7 @@
if (AXIS2_FALSE == processed)
{
axis2_http_header_t *cont_len = NULL;
+ axis2_http_header_t *cont_type = NULL;
axis2_char_t *body_string = NULL;
axis2_char_t *wsdl = NULL;
axis2_http_simple_response_set_status_line(response, env,
@@ -268,7 +269,8 @@
wsdl = strstr (url_external_form, AXIS2_REQUEST_WSDL);
if (wsdl)
{
- body_string = axis2_http_transport_utils_get_services_static_wsdl(env, conf_ctx, url_external_form);
+ body_string = axis2_http_transport_utils_get_services_static_wsdl(
+ env, conf_ctx, url_external_form);
}
else
{
@@ -284,7 +286,10 @@
cont_len = axis2_http_header_create(env,
AXIS2_HTTP_HEADER_CONTENT_LENGTH, str_len);
axis2_http_simple_response_set_header(response, env, cont_len);
- }
+ cont_type = axis2_http_header_create(env,
+ AXIS2_HTTP_HEADER_CONTENT_TYPE, AXIS2_HTTP_HEADER_ACCEPT_TEXT_HTML);
+ axis2_http_simple_response_set_header(response, env, cont_type);
+ }
axis2_http_worker_set_response_headers(http_worker, env, svr_conn,
simple_request, response, 0);
axis2_simple_http_svr_conn_write_response(svr_conn, env, response);
Modified: webservices/axis2/trunk/c/src/core/transport/http/server/simple_axis2_server/http_server_main.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/http/server/simple_axis2_server/http_server_main.c?view=diff&rev=550737&r1=550736&r2=550737
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/http/server/simple_axis2_server/http_server_main.c (original)
+++ webservices/axis2/trunk/c/src/core/transport/http/server/simple_axis2_server/http_server_main.c Tue Jun 26 01:29:58 2007
@@ -82,7 +82,7 @@
}
/*axutil_allocator_free(allocator);*/
axiom_xml_reader_cleanup();
- _exit(status);
+ exit(status);
}
int main(
Modified: webservices/axis2/trunk/c/src/core/transport/http/util/http_transport_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/http/util/http_transport_utils.c?view=diff&rev=550737&r1=550736&r2=550737
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/http/util/http_transport_utils.c (original)
+++ webservices/axis2/trunk/c/src/core/transport/http/util/http_transport_utils.c Tue Jun 26 01:29:58 2007
@@ -1161,7 +1161,9 @@
axis2_char_t *mime_boundary = NULL;
axis2_msg_ctx_set_doing_mtom(msg_ctx, env, AXIS2_TRUE);
/* get mime boundry */
- mime_boundary = axis2_http_transport_utils_get_value_from_content_type(env, content_type, AXIS2_HTTP_HEADER_CONTENT_TYPE_MIME_BOUNDARY);
+ mime_boundary = axis2_http_transport_utils_get_value_from_content_type(
+ env, content_type,
+ AXIS2_HTTP_HEADER_CONTENT_TYPE_MIME_BOUNDARY);
if (mime_boundary)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org