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 2006/06/04 05:09:41 UTC
svn commit: r411506 [13/27] - in /webservices/axis2/trunk/c: axiom/include/
axiom/src/attachments/ axiom/src/om/ axiom/src/parser/guththila/
axiom/src/parser/libxml2/ axiom/src/soap/ axiom/test/om/ axiom/test/soap/
guththila/src/ include/ modules/core/...
Modified: webservices/axis2/trunk/c/modules/core/transport/http/http_worker.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/http_worker.c?rev=411506&r1=411505&r2=411506&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/http_worker.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/http_worker.c Sat Jun 3 20:09:08 2006
@@ -31,14 +31,14 @@
/**
* @brief HTTP Worker struct impl
- * Axis2 HTTP Worker impl
+ * Axis2 HTTP Worker impl
*/
typedef struct axis2_http_worker_impl axis2_http_worker_impl_t;
struct axis2_http_worker_impl
{
- axis2_http_worker_t http_worker;
- axis2_conf_ctx_t *conf_ctx;
+ axis2_http_worker_t http_worker;
+ axis2_conf_ctx_t *conf_ctx;
int svr_port;
};
@@ -49,37 +49,37 @@
axis2_bool_t AXIS2_CALL
axis2_http_worker_process_request(axis2_http_worker_t *http_worker,
- const axis2_env_t *env,
- axis2_simple_http_svr_conn_t *svr_conn,
- axis2_http_simple_request_t *simple_request);
+ const axis2_env_t *env,
+ axis2_simple_http_svr_conn_t *svr_conn,
+ axis2_http_simple_request_t *simple_request);
axis2_status_t AXIS2_CALL
axis2_http_worker_set_response_headers(axis2_http_worker_t *http_worker,
- const axis2_env_t *env,
- axis2_simple_http_svr_conn_t *svr_conn,
- axis2_http_simple_request_t *simple_request,
- axis2_http_simple_response_t *simple_response,
- axis2_ssize_t content_length);
+ const axis2_env_t *env,
+ axis2_simple_http_svr_conn_t *svr_conn,
+ axis2_http_simple_request_t *simple_request,
+ axis2_http_simple_response_t *simple_response,
+ axis2_ssize_t content_length);
axis2_status_t AXIS2_CALL
axis2_http_worker_set_transport_out_config(axis2_http_worker_t *http_worker,
- const axis2_env_t *env,
- axis2_conf_ctx_t *conf_ctx,
- axis2_http_simple_response_t *simple_response);
-
+ const axis2_env_t *env,
+ axis2_conf_ctx_t *conf_ctx,
+ axis2_http_simple_response_t *simple_response);
+
axis2_hash_t* AXIS2_CALL
axis2_http_worker_get_headers(axis2_http_worker_t *http_worker,
- const axis2_env_t *env,
- axis2_http_simple_request_t *request);
+ const axis2_env_t *env,
+ axis2_http_simple_request_t *request);
axis2_status_t AXIS2_CALL
axis2_http_worker_set_svr_port(axis2_http_worker_t *worker,
const axis2_env_t *env, int port);
-
+
axis2_status_t AXIS2_CALL
axis2_http_worker_free(axis2_http_worker_t *http_worker,
- const axis2_env_t *env);
-
+ const axis2_env_t *env);
+
/***************************** End of function headers ************************/
AXIS2_EXTERN axis2_http_worker_t * AXIS2_CALL
@@ -89,23 +89,23 @@
AXIS2_ENV_CHECK(env, NULL);
http_worker_impl = (axis2_http_worker_impl_t *)
AXIS2_MALLOC (env->allocator, sizeof(axis2_http_worker_impl_t));
-
+
if(NULL == http_worker_impl)
- {
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ {
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
- }
+ }
http_worker_impl->conf_ctx = conf_ctx;
http_worker_impl->svr_port = 9090; /* default - must set later*/
http_worker_impl->http_worker.ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_http_worker_ops_t));
if(NULL == http_worker_impl->http_worker.ops)
- {
- axis2_http_worker_free((axis2_http_worker_t*)http_worker_impl, env);
+ {
+ axis2_http_worker_free((axis2_http_worker_t*)http_worker_impl, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
- }
+ }
http_worker_impl->http_worker.ops->process_request =
axis2_http_worker_process_request;
@@ -113,47 +113,47 @@
axis2_http_worker_set_svr_port;
http_worker_impl->http_worker.ops->free = axis2_http_worker_free;
- return &(http_worker_impl->http_worker);
+ return &(http_worker_impl->http_worker);
}
axis2_status_t AXIS2_CALL
axis2_http_worker_free (axis2_http_worker_t *http_worker, const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_INTF_TO_IMPL(http_worker)->conf_ctx = NULL;
if(NULL != http_worker->ops)
AXIS2_FREE(env->allocator, http_worker->ops);
- AXIS2_FREE(env->allocator, AXIS2_INTF_TO_IMPL(http_worker));
+ AXIS2_FREE(env->allocator, AXIS2_INTF_TO_IMPL(http_worker));
- return AXIS2_SUCCESS;
+ return AXIS2_SUCCESS;
}
axis2_bool_t AXIS2_CALL
axis2_http_worker_process_request(axis2_http_worker_t *http_worker,
- const axis2_env_t *env,
- axis2_simple_http_svr_conn_t *svr_conn,
- axis2_http_simple_request_t *simple_request)
+ const axis2_env_t *env,
+ axis2_simple_http_svr_conn_t *svr_conn,
+ axis2_http_simple_request_t *simple_request)
{
axis2_http_worker_impl_t *http_worker_impl = NULL;
- axis2_conf_ctx_t *conf_ctx = NULL;
- axis2_msg_ctx_t *msg_ctx = NULL;
- axis2_stream_t *request_body = NULL;
- axis2_stream_t *out_stream = axis2_stream_create_basic(env);
- axis2_http_simple_response_t *response = NULL;
- axis2_transport_out_desc_t *out_desc = NULL;
- axis2_transport_in_desc_t *in_desc = NULL;
- axis2_char_t *http_version = NULL;
- axis2_char_t *soap_action = NULL;
- axis2_bool_t processed = AXIS2_FALSE;
- axis2_char_t *ctx_written = NULL;
- axis2_status_t status = AXIS2_FAILURE;
- int content_length = -1;
- axis2_http_header_t *encoding_header = NULL;
- axis2_char_t *encoding_header_value = NULL;
- axis2_op_ctx_t *op_ctx = NULL;
+ axis2_conf_ctx_t *conf_ctx = NULL;
+ axis2_msg_ctx_t *msg_ctx = NULL;
+ axis2_stream_t *request_body = NULL;
+ axis2_stream_t *out_stream = axis2_stream_create_basic(env);
+ axis2_http_simple_response_t *response = NULL;
+ axis2_transport_out_desc_t *out_desc = NULL;
+ axis2_transport_in_desc_t *in_desc = NULL;
+ axis2_char_t *http_version = NULL;
+ axis2_char_t *soap_action = NULL;
+ axis2_bool_t processed = AXIS2_FALSE;
+ axis2_char_t *ctx_written = NULL;
+ axis2_status_t status = AXIS2_FAILURE;
+ int content_length = -1;
+ axis2_http_header_t *encoding_header = NULL;
+ axis2_char_t *encoding_header_value = NULL;
+ axis2_op_ctx_t *op_ctx = NULL;
axis2_char_t *svr_ip = NULL;
axis2_url_t *request_url = NULL;
axis2_http_out_transport_info_t *http_out_transport_info = NULL;
@@ -162,80 +162,80 @@
axis2_char_t *url_external_form = NULL;
axis2_qname_t *tmp_qname = NULL;
axis2_char_t *svc_grp_uuid = NULL;
-
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, svr_conn, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, simple_request, AXIS2_FAILURE);
-
- http_worker_impl = AXIS2_INTF_TO_IMPL(http_worker);
- conf_ctx = http_worker_impl->conf_ctx;
-
- if(NULL == conf_ctx)
- {
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NULL_CONFIGURATION_CONTEXT,
- AXIS2_FAILURE);
- return AXIS2_FALSE;
- }
-
- content_length = AXIS2_HTTP_SIMPLE_REQUEST_GET_CONTENT_LENGTH(simple_request
- , env);
- http_version = AXIS2_HTTP_REQUEST_LINE_GET_HTTP_VERSION
- (AXIS2_HTTP_SIMPLE_REQUEST_GET_REQUEST_LINE
- (simple_request, env), env);
- if(NULL == http_version)
- {
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NULL_HTTP_VERSION,
- AXIS2_FAILURE);
- return AXIS2_FAILURE;
- }
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Client HTTP version %s",
- http_version);
-
- response = axis2_http_simple_response_create_default(env);
- encoding_header = AXIS2_HTTP_SIMPLE_REQUEST_GET_FIRST_HEADER(simple_request,
- env, AXIS2_HTTP_HEADER_TRANSFER_ENCODING);
- if(NULL != encoding_header)
- {
- encoding_header_value = AXIS2_HTTP_HEADER_GET_VALUE(encoding_header,
- env);
- }
- if(content_length < 0 && (NULL != encoding_header_value && 0 != AXIS2_STRCMP
- (encoding_header_value,
- AXIS2_HTTP_HEADER_TRANSFER_ENCODING_CHUNKED)))
- {
- if(0 == AXIS2_STRCASECMP(AXIS2_HTTP_REQUEST_LINE_GET_METHOD(
- AXIS2_HTTP_SIMPLE_REQUEST_GET_REQUEST_LINE(
- simple_request, env), env), AXIS2_HTTP_HEADER_POST))
- {
- AXIS2_HTTP_SIMPLE_RESPONSE_SET_STATUS_LINE(response, env,
- http_version, 411, "Length Required");
- status = AXIS2_SIMPLE_HTTP_SVR_CONN_WRITE_RESPONSE(svr_conn, env,
- response);
- AXIS2_HTTP_SIMPLE_RESPONSE_FREE(response, env);
- response = NULL;
- return status;
- }
-
- }
- request_body = AXIS2_HTTP_SIMPLE_REQUEST_GET_BODY(simple_request, env);
+
+ http_worker_impl = AXIS2_INTF_TO_IMPL(http_worker);
+ conf_ctx = http_worker_impl->conf_ctx;
+
+ if(NULL == conf_ctx)
+ {
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NULL_CONFIGURATION_CONTEXT,
+ AXIS2_FAILURE);
+ return AXIS2_FALSE;
+ }
+
+ content_length = AXIS2_HTTP_SIMPLE_REQUEST_GET_CONTENT_LENGTH(simple_request
+ , env);
+ http_version = AXIS2_HTTP_REQUEST_LINE_GET_HTTP_VERSION
+ (AXIS2_HTTP_SIMPLE_REQUEST_GET_REQUEST_LINE
+ (simple_request, env), env);
+ if(NULL == http_version)
+ {
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NULL_HTTP_VERSION,
+ AXIS2_FAILURE);
+ return AXIS2_FAILURE;
+ }
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Client HTTP version %s",
+ http_version);
+
+ response = axis2_http_simple_response_create_default(env);
+ encoding_header = AXIS2_HTTP_SIMPLE_REQUEST_GET_FIRST_HEADER(simple_request,
+ env, AXIS2_HTTP_HEADER_TRANSFER_ENCODING);
+ if(NULL != encoding_header)
+ {
+ encoding_header_value = AXIS2_HTTP_HEADER_GET_VALUE(encoding_header,
+ env);
+ }
+ if(content_length < 0 && (NULL != encoding_header_value && 0 != AXIS2_STRCMP
+ (encoding_header_value,
+ AXIS2_HTTP_HEADER_TRANSFER_ENCODING_CHUNKED)))
+ {
+ if(0 == AXIS2_STRCASECMP(AXIS2_HTTP_REQUEST_LINE_GET_METHOD(
+ AXIS2_HTTP_SIMPLE_REQUEST_GET_REQUEST_LINE(
+ simple_request, env), env), AXIS2_HTTP_HEADER_POST))
+ {
+ AXIS2_HTTP_SIMPLE_RESPONSE_SET_STATUS_LINE(response, env,
+ http_version, 411, "Length Required");
+ status = AXIS2_SIMPLE_HTTP_SVR_CONN_WRITE_RESPONSE(svr_conn, env,
+ response);
+ AXIS2_HTTP_SIMPLE_RESPONSE_FREE(response, env);
+ response = NULL;
+ return status;
+ }
+
+ }
+ request_body = AXIS2_HTTP_SIMPLE_REQUEST_GET_BODY(simple_request, env);
tmp_qname = axis2_qname_create(env, AXIS2_TRANSPORT_HTTP, NULL, NULL);
- out_desc = AXIS2_CONF_GET_TRANSPORT_OUT(AXIS2_CONF_CTX_GET_CONF
- (http_worker_impl->conf_ctx, env), env,
+ out_desc = AXIS2_CONF_GET_TRANSPORT_OUT(AXIS2_CONF_CTX_GET_CONF
+ (http_worker_impl->conf_ctx, env), env,
tmp_qname);
- in_desc = AXIS2_CONF_GET_TRANSPORT_IN(AXIS2_CONF_CTX_GET_CONF
- (http_worker_impl->conf_ctx, env), env,
- tmp_qname);
+ in_desc = AXIS2_CONF_GET_TRANSPORT_IN(AXIS2_CONF_CTX_GET_CONF
+ (http_worker_impl->conf_ctx, env), env,
+ tmp_qname);
AXIS2_QNAME_FREE(tmp_qname, env);
- msg_ctx = axis2_msg_ctx_create(env, conf_ctx, in_desc, out_desc);
- AXIS2_MSG_CTX_SET_SERVER_SIDE(msg_ctx, env, AXIS2_TRUE);
-
-
- if(0 == AXIS2_STRCASECMP(http_version, AXIS2_HTTP_HEADER_PROTOCOL_11))
- {
- axis2_http_worker_set_transport_out_config(http_worker, env, conf_ctx,
- response);
- }
+ msg_ctx = axis2_msg_ctx_create(env, conf_ctx, in_desc, out_desc);
+ AXIS2_MSG_CTX_SET_SERVER_SIDE(msg_ctx, env, AXIS2_TRUE);
+
+
+ if(0 == AXIS2_STRCASECMP(http_version, AXIS2_HTTP_HEADER_PROTOCOL_11))
+ {
+ axis2_http_worker_set_transport_out_config(http_worker, env, conf_ctx,
+ response);
+ }
svr_ip = AXIS2_SIMPLE_HTTP_SVR_CONN_GET_SVR_IP(svr_conn, env);
request_url = axis2_url_create(env, "http", svr_ip,
http_worker_impl->svr_port,
@@ -248,19 +248,19 @@
AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
AXIS2_PROPERTY_SET_FREE_FUNC(property, env, axis2_stream_free_void_arg);
AXIS2_PROPERTY_SET_VALUE(property, env, out_stream);
- AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, AXIS2_TRANSPORT_OUT, property,
- AXIS2_FALSE);
+ AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, AXIS2_TRANSPORT_OUT, property,
+ AXIS2_FALSE);
property = axis2_property_create(env);
AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
AXIS2_PROPERTY_SET_FREE_FUNC(property, env, axis2_hash_free_void_arg);
headers = axis2_http_worker_get_headers(http_worker, env, simple_request);
AXIS2_PROPERTY_SET_VALUE(property, env, headers);
- AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, AXIS2_TRANSPORT_HEADERS, property,
+ AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, AXIS2_TRANSPORT_HEADERS, property,
AXIS2_FALSE);
svc_grp_uuid = axis2_uuid_gen(env);
- AXIS2_MSG_CTX_SET_SVC_GRP_CTX_ID(msg_ctx, env, svc_grp_uuid);
+ AXIS2_MSG_CTX_SET_SVC_GRP_CTX_ID(msg_ctx, env, svc_grp_uuid);
if(NULL != svc_grp_uuid)
{
@@ -274,165 +274,165 @@
axis2_http_out_transport_info_free_void_arg);
http_out_transport_info = axis2_http_out_transport_info_create(env, response);
AXIS2_PROPERTY_SET_VALUE(property, env, http_out_transport_info);
- AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, AXIS2_HTTP_OUT_TRANSPORT_INFO,
- property,
- AXIS2_FALSE);
-
- if(NULL != AXIS2_HTTP_SIMPLE_REQUEST_GET_FIRST_HEADER(simple_request, env,
- AXIS2_HTTP_HEADER_SOAP_ACTION))
- {
- soap_action = AXIS2_HTTP_HEADER_GET_VALUE(
- AXIS2_HTTP_SIMPLE_REQUEST_GET_FIRST_HEADER(
- simple_request, env, AXIS2_HTTP_HEADER_SOAP_ACTION),
- env);
- }
- if(0 == AXIS2_STRCASECMP(AXIS2_HTTP_REQUEST_LINE_GET_METHOD(
- AXIS2_HTTP_SIMPLE_REQUEST_GET_REQUEST_LINE(
- simple_request, env), env), AXIS2_HTTP_HEADER_GET))
- {
- processed = axis2_http_transport_utils_process_http_get_request
+ AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, AXIS2_HTTP_OUT_TRANSPORT_INFO,
+ property,
+ AXIS2_FALSE);
+
+ if(NULL != AXIS2_HTTP_SIMPLE_REQUEST_GET_FIRST_HEADER(simple_request, env,
+ AXIS2_HTTP_HEADER_SOAP_ACTION))
+ {
+ soap_action = AXIS2_HTTP_HEADER_GET_VALUE(
+ AXIS2_HTTP_SIMPLE_REQUEST_GET_FIRST_HEADER(
+ simple_request, env, AXIS2_HTTP_HEADER_SOAP_ACTION),
+ env);
+ }
+ if(0 == AXIS2_STRCASECMP(AXIS2_HTTP_REQUEST_LINE_GET_METHOD(
+ AXIS2_HTTP_SIMPLE_REQUEST_GET_REQUEST_LINE(
+ simple_request, env), env), AXIS2_HTTP_HEADER_GET))
+ {
+ processed = axis2_http_transport_utils_process_http_get_request
(env, msg_ctx, request_body, out_stream,
- AXIS2_HTTP_SIMPLE_REQUEST_GET_CONTENT_TYPE(
- simple_request, env) ,soap_action,
+ AXIS2_HTTP_SIMPLE_REQUEST_GET_CONTENT_TYPE(
+ simple_request, env) ,soap_action,
AXIS2_URL_TO_EXTERNAL_FORM(request_url, env),
conf_ctx,
axis2_http_transport_utils_get_request_params(env,
- AXIS2_HTTP_REQUEST_LINE_GET_URI(
- AXIS2_HTTP_SIMPLE_REQUEST_GET_REQUEST_LINE(
- simple_request, env), env)));
- if(AXIS2_FALSE == processed)
- {
- axis2_http_header_t *cont_len = NULL;
- axis2_char_t *body_string = NULL;
- AXIS2_HTTP_SIMPLE_RESPONSE_SET_STATUS_LINE(response, env,
- http_version, AXIS2_HTTP_RESPONSE_OK_CODE_VAL, "OK");
- body_string = axis2_http_transport_utils_get_services_html(env,
- conf_ctx);
- if(NULL != body_string)
- {
- axis2_char_t str_len[10];
- AXIS2_HTTP_SIMPLE_RESPONSE_SET_BODY_STRING(response, env,
- body_string);
- sprintf(str_len, "%d", AXIS2_STRLEN(body_string));
- cont_len = axis2_http_header_create(env,
- AXIS2_HTTP_HEADER_CONTENT_LENGTH,
- str_len);
- AXIS2_HTTP_SIMPLE_RESPONSE_SET_HEADER(response, env, cont_len);
- }
-
- 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);
- AXIS2_HTTP_SIMPLE_RESPONSE_FREE(response, env);
- return AXIS2_TRUE;
- }
-
- }
- else if(0 == AXIS2_STRCASECMP(AXIS2_HTTP_REQUEST_LINE_GET_METHOD(
- AXIS2_HTTP_SIMPLE_REQUEST_GET_REQUEST_LINE(
- simple_request, env), env), AXIS2_HTTP_HEADER_POST))
- {
- status = axis2_http_transport_utils_process_http_post_request
+ AXIS2_HTTP_REQUEST_LINE_GET_URI(
+ AXIS2_HTTP_SIMPLE_REQUEST_GET_REQUEST_LINE(
+ simple_request, env), env)));
+ if(AXIS2_FALSE == processed)
+ {
+ axis2_http_header_t *cont_len = NULL;
+ axis2_char_t *body_string = NULL;
+ AXIS2_HTTP_SIMPLE_RESPONSE_SET_STATUS_LINE(response, env,
+ http_version, AXIS2_HTTP_RESPONSE_OK_CODE_VAL, "OK");
+ body_string = axis2_http_transport_utils_get_services_html(env,
+ conf_ctx);
+ if(NULL != body_string)
+ {
+ axis2_char_t str_len[10];
+ AXIS2_HTTP_SIMPLE_RESPONSE_SET_BODY_STRING(response, env,
+ body_string);
+ sprintf(str_len, "%d", AXIS2_STRLEN(body_string));
+ cont_len = axis2_http_header_create(env,
+ AXIS2_HTTP_HEADER_CONTENT_LENGTH,
+ str_len);
+ AXIS2_HTTP_SIMPLE_RESPONSE_SET_HEADER(response, env, cont_len);
+ }
+
+ 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);
+ AXIS2_HTTP_SIMPLE_RESPONSE_FREE(response, env);
+ return AXIS2_TRUE;
+ }
+
+ }
+ else if(0 == AXIS2_STRCASECMP(AXIS2_HTTP_REQUEST_LINE_GET_METHOD(
+ AXIS2_HTTP_SIMPLE_REQUEST_GET_REQUEST_LINE(
+ simple_request, env), env), AXIS2_HTTP_HEADER_POST))
+ {
+ status = axis2_http_transport_utils_process_http_post_request
(env, msg_ctx, request_body, out_stream,
- AXIS2_HTTP_SIMPLE_REQUEST_GET_CONTENT_TYPE(
- simple_request, env) , content_length, soap_action,
+ AXIS2_HTTP_SIMPLE_REQUEST_GET_CONTENT_TYPE(
+ simple_request, env) , content_length, soap_action,
url_external_form);
- if(status == AXIS2_FAILURE)
- {
- axis2_msg_ctx_t *fault_ctx = NULL;
- axis2_engine_t *engine = axis2_engine_create(env, conf_ctx);
- axis2_http_request_line_t *req_line = NULL;
- axis2_http_status_line_t *tmp_stat_line = NULL;
- axis2_char_t status_line_str[100];
- if(NULL == engine)
- {
- return AXIS2_FALSE;
- }
- fault_ctx = AXIS2_ENGINE_CREATE_FAULT_MSG_CTX(engine, env, msg_ctx);
- req_line = AXIS2_HTTP_SIMPLE_REQUEST_GET_REQUEST_LINE(simple_request
- , env);
- if(NULL != req_line)
- {
- sprintf(status_line_str, "%s 500 Internal Server Error\r\n",
- AXIS2_HTTP_REQUEST_LINE_GET_HTTP_VERSION(req_line,
- env));
- }
- else
- {
- sprintf(status_line_str, "HTTP/1.1 500 Internal Server Error\
- \r\n");
- }
- tmp_stat_line = axis2_http_status_line_create(env,
- status_line_str);
- AXIS2_ENGINE_SEND_FAULT(engine, env, fault_ctx);
- AXIS2_HTTP_SIMPLE_RESPONSE_SET_STATUS_LINE(response, env,
- AXIS2_HTTP_STATUS_LINE_GET_HTTP_VERSION(tmp_stat_line, env),
+ if(status == AXIS2_FAILURE)
+ {
+ axis2_msg_ctx_t *fault_ctx = NULL;
+ axis2_engine_t *engine = axis2_engine_create(env, conf_ctx);
+ axis2_http_request_line_t *req_line = NULL;
+ axis2_http_status_line_t *tmp_stat_line = NULL;
+ axis2_char_t status_line_str[100];
+ if(NULL == engine)
+ {
+ return AXIS2_FALSE;
+ }
+ fault_ctx = AXIS2_ENGINE_CREATE_FAULT_MSG_CTX(engine, env, msg_ctx);
+ req_line = AXIS2_HTTP_SIMPLE_REQUEST_GET_REQUEST_LINE(simple_request
+ , env);
+ if(NULL != req_line)
+ {
+ sprintf(status_line_str, "%s 500 Internal Server Error\r\n",
+ AXIS2_HTTP_REQUEST_LINE_GET_HTTP_VERSION(req_line,
+ env));
+ }
+ else
+ {
+ sprintf(status_line_str, "HTTP/1.1 500 Internal Server Error\
+ \r\n");
+ }
+ tmp_stat_line = axis2_http_status_line_create(env,
+ status_line_str);
+ AXIS2_ENGINE_SEND_FAULT(engine, env, fault_ctx);
+ AXIS2_HTTP_SIMPLE_RESPONSE_SET_STATUS_LINE(response, env,
+ AXIS2_HTTP_STATUS_LINE_GET_HTTP_VERSION(tmp_stat_line, env),
AXIS2_HTTP_STATUS_LINE_GET_STATUS_CODE(tmp_stat_line, env) ,
AXIS2_HTTP_STATUS_LINE_GET_REASON_PHRASE(tmp_stat_line, env));
- AXIS2_HTTP_SIMPLE_RESPONSE_SET_BODY_STREAM(response, env,
- out_stream);
- axis2_http_worker_set_response_headers(http_worker, env, svr_conn,
- simple_request, response, AXIS2_STREAM_BASIC_GET_LEN(
- out_stream, env));
-
- status = AXIS2_SIMPLE_HTTP_SVR_CONN_WRITE_RESPONSE(svr_conn, env,
- response);
- return status;
-
- }
- }
- op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
- if(NULL != op_ctx)
- {
+ AXIS2_HTTP_SIMPLE_RESPONSE_SET_BODY_STREAM(response, env,
+ out_stream);
+ axis2_http_worker_set_response_headers(http_worker, env, svr_conn,
+ simple_request, response, AXIS2_STREAM_BASIC_GET_LEN(
+ out_stream, env));
+
+ status = AXIS2_SIMPLE_HTTP_SVR_CONN_WRITE_RESPONSE(svr_conn, env,
+ response);
+ return status;
+
+ }
+ }
+ op_ctx = AXIS2_MSG_CTX_GET_OP_CTX(msg_ctx, env);
+ if(NULL != op_ctx)
+ {
axis2_ctx_t *ctx = AXIS2_OP_CTX_GET_BASE(AXIS2_MSG_CTX_GET_OP_CTX(
msg_ctx, env), env);
if (NULL != ctx)
- {
- property = AXIS2_CTX_GET_PROPERTY(ctx, env,
- AXIS2_RESPONSE_WRITTEN, AXIS2_FALSE);
+ {
+ property = AXIS2_CTX_GET_PROPERTY(ctx, env,
+ AXIS2_RESPONSE_WRITTEN, AXIS2_FALSE);
if (property)
ctx_written = AXIS2_PROPERTY_GET_VALUE(property, env);
- }
- }
- if(NULL != ctx_written && AXIS2_STRCASECMP(ctx_written, "TRUE") == 0)
- {
- AXIS2_HTTP_SIMPLE_RESPONSE_SET_STATUS_LINE(response, env, http_version,
- AXIS2_HTTP_RESPONSE_OK_CODE_VAL, "OK");
- AXIS2_HTTP_SIMPLE_RESPONSE_SET_BODY_STREAM(response, env, out_stream);
- }
- else
- {
- AXIS2_HTTP_SIMPLE_RESPONSE_SET_STATUS_LINE(response, env, http_version,
- AXIS2_HTTP_RESPONSE_ACK_CODE_VAL, "Accepted");
- }
- axis2_http_worker_set_response_headers(http_worker, env, svr_conn,
- simple_request, response, AXIS2_STREAM_BASIC_GET_LEN(
- out_stream, env));
-
- status = AXIS2_SIMPLE_HTTP_SVR_CONN_WRITE_RESPONSE(svr_conn, env, response);
+ }
+ }
+ if(NULL != ctx_written && AXIS2_STRCASECMP(ctx_written, "TRUE") == 0)
+ {
+ AXIS2_HTTP_SIMPLE_RESPONSE_SET_STATUS_LINE(response, env, http_version,
+ AXIS2_HTTP_RESPONSE_OK_CODE_VAL, "OK");
+ AXIS2_HTTP_SIMPLE_RESPONSE_SET_BODY_STREAM(response, env, out_stream);
+ }
+ else
+ {
+ AXIS2_HTTP_SIMPLE_RESPONSE_SET_STATUS_LINE(response, env, http_version,
+ AXIS2_HTTP_RESPONSE_ACK_CODE_VAL, "Accepted");
+ }
+ axis2_http_worker_set_response_headers(http_worker, env, svr_conn,
+ simple_request, response, AXIS2_STREAM_BASIC_GET_LEN(
+ out_stream, env));
+
+ status = AXIS2_SIMPLE_HTTP_SVR_CONN_WRITE_RESPONSE(svr_conn, env, response);
AXIS2_FREE(env->allocator, url_external_form);
url_external_form = NULL;
- AXIS2_MSG_CTX_FREE(msg_ctx, env);
- msg_ctx = NULL;
+ AXIS2_MSG_CTX_FREE(msg_ctx, env);
+ msg_ctx = NULL;
AXIS2_URL_FREE(request_url, env);
request_url = NULL;
- AXIS2_HTTP_SIMPLE_RESPONSE_FREE(response, env);
- response = NULL;
+ AXIS2_HTTP_SIMPLE_RESPONSE_FREE(response, env);
+ response = NULL;
return status;
}
axis2_status_t AXIS2_CALL
axis2_http_worker_set_response_headers(axis2_http_worker_t *http_worker,
- const axis2_env_t *env,
- axis2_simple_http_svr_conn_t *svr_conn,
- axis2_http_simple_request_t *simple_request,
- axis2_http_simple_response_t *simple_response,
- axis2_ssize_t content_length)
+ const axis2_env_t *env,
+ axis2_simple_http_svr_conn_t *svr_conn,
+ axis2_http_simple_request_t *simple_request,
+ axis2_http_simple_response_t *simple_response,
+ axis2_ssize_t content_length)
{
axis2_http_header_t *conn_header = NULL;
-
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, svr_conn, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, simple_request, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, simple_response, AXIS2_FAILURE);
@@ -459,7 +459,7 @@
{
axis2_http_header_t *header = axis2_http_header_create(env,
AXIS2_HTTP_HEADER_CONNECTION,
- AXIS2_HTTP_HEADER_CONNECTION_CLOSE);
+ AXIS2_HTTP_HEADER_CONNECTION_CLOSE);
AXIS2_HTTP_SIMPLE_RESPONSE_SET_HEADER(simple_response, env,
header);
AXIS2_SIMPLE_HTTP_SVR_CONN_SET_KEEP_ALIVE(svr_conn, env,
@@ -469,8 +469,8 @@
else
{
if(AXIS2_HTTP_SIMPLE_RESPONSE_GET_HTTP_VERSION(simple_response, env)
- && AXIS2_STRCASECMP(
- AXIS2_HTTP_SIMPLE_RESPONSE_GET_HTTP_VERSION(
+ && AXIS2_STRCASECMP(
+ AXIS2_HTTP_SIMPLE_RESPONSE_GET_HTTP_VERSION(
simple_response, env), AXIS2_HTTP_HEADER_PROTOCOL_11))
{
AXIS2_SIMPLE_HTTP_SVR_CONN_SET_KEEP_ALIVE(svr_conn, env,
@@ -488,8 +488,8 @@
if(0 != content_length)
{
axis2_char_t content_len_str[10];
- axis2_http_header_t *content_len_hdr = NULL;
-
+ axis2_http_header_t *content_len_hdr = NULL;
+
sprintf(content_len_str, "%d", content_length);
content_len_hdr = axis2_http_header_create(
env, AXIS2_HTTP_HEADER_CONTENT_LENGTH, content_len_str);
@@ -497,14 +497,14 @@
content_len_hdr);
}
}
- else
- {
- axis2_http_header_t *transfer_enc_header = axis2_http_header_create(
- env, AXIS2_HTTP_HEADER_TRANSFER_ENCODING,
- AXIS2_HTTP_HEADER_TRANSFER_ENCODING_CHUNKED);
- AXIS2_HTTP_SIMPLE_RESPONSE_SET_HEADER(simple_response, env,
- transfer_enc_header);
- }
+ else
+ {
+ axis2_http_header_t *transfer_enc_header = axis2_http_header_create(
+ env, AXIS2_HTTP_HEADER_TRANSFER_ENCODING,
+ AXIS2_HTTP_HEADER_TRANSFER_ENCODING_CHUNKED);
+ AXIS2_HTTP_SIMPLE_RESPONSE_SET_HEADER(simple_response, env,
+ transfer_enc_header);
+ }
}
return AXIS2_SUCCESS;
}
@@ -515,20 +515,20 @@
*/
axis2_status_t AXIS2_CALL
axis2_http_worker_set_transport_out_config(axis2_http_worker_t *http_worker,
- const axis2_env_t *env,
- axis2_conf_ctx_t *conf_ctx,
- axis2_http_simple_response_t *simple_response)
+ const axis2_env_t *env,
+ axis2_conf_ctx_t *conf_ctx,
+ axis2_http_simple_response_t *simple_response)
{
axis2_conf_t *config = NULL;
- axis2_hash_t *tranport_outs = NULL;
-
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ axis2_hash_t *tranport_outs = NULL;
+
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, conf_ctx, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, simple_response, AXIS2_FAILURE);
-
- config = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
+
+ config = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
tranport_outs = AXIS2_CONF_GET_TRANSPORTS_OUT(config, env);
-
+
/*
TODO implement the method
@@ -538,46 +538,46 @@
axis2_hash_t* AXIS2_CALL
axis2_http_worker_get_headers(axis2_http_worker_t *http_worker,
- const axis2_env_t *env, axis2_http_simple_request_t *request)
+ const axis2_env_t *env, axis2_http_simple_request_t *request)
{
- axis2_array_list_t *header_list = NULL;
- int hdr_count = 0;
- int i = 0;
- axis2_hash_t *header_map = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ axis2_array_list_t *header_list = NULL;
+ int hdr_count = 0;
+ int i = 0;
+ axis2_hash_t *header_map = NULL;
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, request, AXIS2_FAILURE);
-
- header_list = AXIS2_HTTP_SIMPLE_REQUEST_GET_HEADERS(request, env);
- if(NULL == header_list)
- {
- return NULL;
- }
- hdr_count = AXIS2_ARRAY_LIST_SIZE(header_list, env);
- if(0 == hdr_count)
- {
- return NULL;
- }
-
- for(i = 0; i < hdr_count; i++)
- {
- axis2_http_header_t *tmp_hdr = NULL;
- tmp_hdr = AXIS2_ARRAY_LIST_GET(header_list, env, i);
- if(NULL == tmp_hdr)
- {
- continue;
- }
- if(NULL == header_map)
- {
- header_map = axis2_hash_make(env);
- if(NULL == header_map)
- {
- return NULL;
- }
- }
- axis2_hash_set(header_map, AXIS2_HTTP_HEADER_GET_NAME(tmp_hdr, env),
- AXIS2_HASH_KEY_STRING, tmp_hdr);
- }
- return header_map;
+
+ header_list = AXIS2_HTTP_SIMPLE_REQUEST_GET_HEADERS(request, env);
+ if(NULL == header_list)
+ {
+ return NULL;
+ }
+ hdr_count = AXIS2_ARRAY_LIST_SIZE(header_list, env);
+ if(0 == hdr_count)
+ {
+ return NULL;
+ }
+
+ for(i = 0; i < hdr_count; i++)
+ {
+ axis2_http_header_t *tmp_hdr = NULL;
+ tmp_hdr = AXIS2_ARRAY_LIST_GET(header_list, env, i);
+ if(NULL == tmp_hdr)
+ {
+ continue;
+ }
+ if(NULL == header_map)
+ {
+ header_map = axis2_hash_make(env);
+ if(NULL == header_map)
+ {
+ return NULL;
+ }
+ }
+ axis2_hash_set(header_map, AXIS2_HTTP_HEADER_GET_NAME(tmp_hdr, env),
+ AXIS2_HASH_KEY_STRING, tmp_hdr);
+ }
+ return header_map;
}
axis2_status_t AXIS2_CALL
Modified: webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_response_writer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_response_writer.c?rev=411506&r1=411505&r2=411506&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_response_writer.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_response_writer.c Sat Jun 3 20:09:08 2006
@@ -21,14 +21,14 @@
/**
* @brief HTTP Response Writer struct impl
- * Axis2 HTTP Response Writer impl
+ * Axis2 HTTP Response Writer impl
*/
typedef struct axis2_http_response_writer_impl
axis2_http_response_writer_impl_t;
struct axis2_http_response_writer_impl
{
- axis2_http_response_writer_t response_writer;
+ axis2_http_response_writer_t response_writer;
axis2_stream_t *stream;
axis2_char_t *encoding;
};
@@ -85,7 +85,7 @@
axis2_http_response_writer_free(axis2_http_response_writer_t *response_writer,
const axis2_env_t *env);
-
+
/***************************** End of function headers ************************/
axis2_http_response_writer_t* AXIS2_CALL
axis2_http_response_writer_create (const axis2_env_t *env, axis2_stream_t *stream)
@@ -107,24 +107,24 @@
response_writer_impl = (axis2_http_response_writer_impl_t *)AXIS2_MALLOC
(env->allocator, sizeof(
axis2_http_response_writer_impl_t));
-
+
if(NULL == response_writer_impl)
- {
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ {
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
- }
+ }
response_writer_impl->stream = stream;
response_writer_impl->encoding = (axis2_char_t *)AXIS2_STRDUP(encoding, env);
response_writer_impl->response_writer.ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_http_response_writer_ops_t));
if(NULL == response_writer_impl->response_writer.ops)
- {
- axis2_http_response_writer_free((axis2_http_response_writer_t*)
+ {
+ axis2_http_response_writer_free((axis2_http_response_writer_t*)
response_writer_impl, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
- }
+ }
response_writer_impl->response_writer.ops->get_encoding =
axis2_http_response_writer_get_encoding;
@@ -147,7 +147,7 @@
response_writer_impl->response_writer.ops->free =
axis2_http_response_writer_free;
- return &(response_writer_impl->response_writer);
+ return &(response_writer_impl->response_writer);
}
@@ -155,16 +155,16 @@
axis2_http_response_writer_free(axis2_http_response_writer_t *response_writer,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_FREE(env->allocator,
AXIS2_INTF_TO_IMPL(response_writer)->encoding);
if(NULL != response_writer->ops)
AXIS2_FREE(env->allocator, response_writer->ops);
- AXIS2_FREE(env->allocator, AXIS2_INTF_TO_IMPL(response_writer));
+ AXIS2_FREE(env->allocator, AXIS2_INTF_TO_IMPL(response_writer));
- return AXIS2_SUCCESS;
+ return AXIS2_SUCCESS;
}
axis2_char_t* AXIS2_CALL
@@ -203,20 +203,20 @@
(axis2_http_response_writer_t *response_writer,
const axis2_env_t *env, char c)
{
- axis2_http_response_writer_impl_t *writer_impl = NULL;
- int write = -1;
+ axis2_http_response_writer_impl_t *writer_impl = NULL;
+ int write = -1;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
- writer_impl = AXIS2_INTF_TO_IMPL(response_writer);
- if(NULL == writer_impl->stream)
- {
- return AXIS2_FAILURE;
- }
+
+ writer_impl = AXIS2_INTF_TO_IMPL(response_writer);
+ if(NULL == writer_impl->stream)
+ {
+ return AXIS2_FAILURE;
+ }
write = AXIS2_STREAM_WRITE(writer_impl->stream, env, &c, 1);
- if(write < 0)
- {
- return AXIS2_FAILURE;
- }
+ if(write < 0)
+ {
+ return AXIS2_FAILURE;
+ }
return AXIS2_SUCCESS;
}
@@ -227,22 +227,22 @@
const axis2_env_t *env, char *buf, int offset,
axis2_ssize_t len)
{
- axis2_http_response_writer_impl_t *writer_impl = NULL;
- int write = -1;
+ axis2_http_response_writer_impl_t *writer_impl = NULL;
+ int write = -1;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, buf, AXIS2_FAILURE);
-
+
writer_impl = AXIS2_INTF_TO_IMPL(response_writer);
- if(NULL == writer_impl->stream)
- {
- return AXIS2_FAILURE;
- }
+ if(NULL == writer_impl->stream)
+ {
+ return AXIS2_FAILURE;
+ }
write = AXIS2_STREAM_WRITE(writer_impl->stream, env, buf, len);
- if(write < 0)
- {
- return AXIS2_FAILURE;
- }
- /*
+ if(write < 0)
+ {
+ return AXIS2_FAILURE;
+ }
+ /*
TODO handle offset
*/
return AXIS2_SUCCESS;
@@ -254,24 +254,24 @@
(axis2_http_response_writer_t *response_writer,
const axis2_env_t *env, char *str)
{
- axis2_http_response_writer_impl_t *writer_impl = NULL;
- int write = -1;
- int len = -1;
-
+ axis2_http_response_writer_impl_t *writer_impl = NULL;
+ int write = -1;
+ int len = -1;
+
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, str, AXIS2_FAILURE);
writer_impl = AXIS2_INTF_TO_IMPL(response_writer);
-
- len = AXIS2_STRLEN(str);
- if(NULL == writer_impl->stream)
- {
- return AXIS2_FAILURE;
- }
+
+ len = AXIS2_STRLEN(str);
+ if(NULL == writer_impl->stream)
+ {
+ return AXIS2_FAILURE;
+ }
write = AXIS2_STREAM_WRITE(writer_impl->stream, env, str, len);
- if(write < 0)
- {
- return AXIS2_FAILURE;
- }
+ if(write < 0)
+ {
+ return AXIS2_FAILURE;
+ }
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_server.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_server.c?rev=411506&r1=411505&r2=411506&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_server.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_server.c Sat Jun 3 20:09:08 2006
@@ -25,17 +25,17 @@
/**
* @brief HTTP Client struct impl
- * Axis2 HTTP Client impl
+ * Axis2 HTTP Client impl
*/
typedef struct axis2_http_server_impl axis2_http_server_impl_t;
struct axis2_http_server_impl
{
- axis2_transport_receiver_t http_server;
- axis2_http_svr_thread_t *svr_thread;
- int port;
- axis2_conf_ctx_t* conf_ctx;
- axis2_conf_ctx_t* conf_ctx_private;
+ axis2_transport_receiver_t http_server;
+ axis2_http_svr_thread_t *svr_thread;
+ int port;
+ axis2_conf_ctx_t* conf_ctx;
+ axis2_conf_ctx_t* conf_ctx_private;
};
#define AXIS2_INTF_TO_IMPL(http_server) \
@@ -44,8 +44,8 @@
/***************************** Function headers *******************************/
axis2_status_t AXIS2_CALL
axis2_http_server_init(axis2_transport_receiver_t *server, const axis2_env_t *env,
- axis2_conf_ctx_t *conf_ctx,
- axis2_transport_in_desc_t *in_desc);
+ axis2_conf_ctx_t *conf_ctx,
+ axis2_transport_in_desc_t *in_desc);
axis2_status_t AXIS2_CALL
axis2_http_server_start(axis2_transport_receiver_t *server, const axis2_env_t *env);
@@ -54,15 +54,15 @@
axis2_conf_ctx_t* AXIS2_CALL
axis2_http_server_get_conf_ctx (axis2_transport_receiver_t *server,
- const axis2_env_t *env);
+ const axis2_env_t *env);
axis2_endpoint_ref_t* AXIS2_CALL
axis2_http_server_get_reply_to_epr(axis2_transport_receiver_t *server,
- const axis2_env_t *env, axis2_char_t *svc_name);
+ const axis2_env_t *env, axis2_char_t *svc_name);
axis2_bool_t AXIS2_CALL
axis2_http_server_is_running (axis2_transport_receiver_t *server,
- const axis2_env_t *env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_http_server_free (axis2_transport_receiver_t *server, const axis2_env_t *env);
@@ -77,26 +77,26 @@
server_impl = (axis2_http_server_impl_t *)AXIS2_MALLOC
(env->allocator, sizeof(axis2_http_server_impl_t));
-
+
if(NULL == server_impl)
- {
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ {
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
- }
+ }
- server_impl->svr_thread = NULL;
- server_impl->conf_ctx = NULL;
- server_impl->conf_ctx_private = NULL;
- server_impl->port = port;
-
+ server_impl->svr_thread = NULL;
+ server_impl->conf_ctx = NULL;
+ server_impl->conf_ctx_private = NULL;
+ server_impl->port = port;
+
server_impl->http_server.ops = AXIS2_MALLOC(env->allocator,
- sizeof(axis2_transport_receiver_ops_t));
+ sizeof(axis2_transport_receiver_ops_t));
if(NULL == server_impl->http_server.ops)
- {
- axis2_http_server_free((axis2_transport_receiver_t*) server_impl, env);
+ {
+ axis2_http_server_free((axis2_transport_receiver_t*) server_impl, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
- }
+ }
if(repo)
{
/**
@@ -106,81 +106,81 @@
* may lead to double free
*/
server_impl->conf_ctx_private = build_conf_ctx(env, repo);
- if(NULL == server_impl->conf_ctx_private)
- {
- axis2_http_server_free((axis2_transport_receiver_t*) server_impl, env);
- return NULL;
- }
+ if(NULL == server_impl->conf_ctx_private)
+ {
+ axis2_http_server_free((axis2_transport_receiver_t*) server_impl, env);
+ return NULL;
+ }
server_impl->conf_ctx = server_impl->conf_ctx_private;
}
server_impl->http_server.ops->init = axis2_http_server_init;
server_impl->http_server.ops->start = axis2_http_server_start;
server_impl->http_server.ops->stop = axis2_http_server_stop;
- server_impl->http_server.ops->get_reply_to_epr =
- axis2_http_server_get_reply_to_epr;
+ server_impl->http_server.ops->get_reply_to_epr =
+ axis2_http_server_get_reply_to_epr;
server_impl->http_server.ops->get_conf_ctx = axis2_http_server_get_conf_ctx;
server_impl->http_server.ops->is_running = axis2_http_server_is_running;
- server_impl->http_server.ops->free = axis2_http_server_free;
+ server_impl->http_server.ops->free = axis2_http_server_free;
- return &(server_impl->http_server);
+ return &(server_impl->http_server);
}
axis2_status_t AXIS2_CALL
axis2_http_server_free (axis2_transport_receiver_t *server, const axis2_env_t *env)
{
- axis2_http_server_impl_t *server_impl = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ axis2_http_server_impl_t *server_impl = NULL;
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
server_impl = AXIS2_INTF_TO_IMPL(server);
if(NULL != server_impl->svr_thread)
- {
- AXIS2_HTTP_SVR_THREAD_DESTROY(server_impl->svr_thread, env);
- AXIS2_HTTP_SVR_THREAD_FREE(server_impl->svr_thread, env);
- server_impl->svr_thread = NULL;
- }
+ {
+ AXIS2_HTTP_SVR_THREAD_DESTROY(server_impl->svr_thread, env);
+ AXIS2_HTTP_SVR_THREAD_FREE(server_impl->svr_thread, env);
+ server_impl->svr_thread = NULL;
+ }
- if(NULL != server_impl->conf_ctx_private)
- {
- AXIS2_CONF_CTX_FREE(server_impl->conf_ctx_private, env);
- server_impl->conf_ctx_private = NULL;
- }
+ if(NULL != server_impl->conf_ctx_private)
+ {
+ AXIS2_CONF_CTX_FREE(server_impl->conf_ctx_private, env);
+ server_impl->conf_ctx_private = NULL;
+ }
/**
* Do not free this. It may own to some other object
*/
server_impl->conf_ctx = NULL;
- if(NULL != server->ops)
- {
+ if(NULL != server->ops)
+ {
AXIS2_FREE(env->allocator, server->ops);
}
- AXIS2_FREE(env->allocator, server_impl);
- return AXIS2_SUCCESS;
+ AXIS2_FREE(env->allocator, server_impl);
+ return AXIS2_SUCCESS;
}
axis2_status_t AXIS2_CALL
axis2_http_server_init(axis2_transport_receiver_t *server, const axis2_env_t *env,
- axis2_conf_ctx_t *conf_ctx,
- axis2_transport_in_desc_t *in_desc)
+ axis2_conf_ctx_t *conf_ctx,
+ axis2_transport_in_desc_t *in_desc)
{
axis2_http_server_impl_t *server_impl = NULL;
- axis2_char_t *port_str = NULL;
+ axis2_char_t *port_str = NULL;
axis2_param_t *param = NULL;
-
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
server_impl = AXIS2_INTF_TO_IMPL(server);
-
- server_impl->conf_ctx = conf_ctx;
+
+ server_impl->conf_ctx = conf_ctx;
param = (axis2_param_t*)AXIS2_PARAM_CONTAINER_GET_PARAM(
- in_desc->param_container, env, "port");
+ in_desc->param_container, env, "port");
if(NULL != param)
{
- port_str = AXIS2_PARAM_GET_VALUE(param, env);
+ port_str = AXIS2_PARAM_GET_VALUE(param, env);
}
- if(NULL != port_str)
- {
- server_impl->port = atoi(port_str);
- }
- return AXIS2_SUCCESS;
+ if(NULL != port_str)
+ {
+ server_impl->port = atoi(port_str);
+ }
+ return AXIS2_SUCCESS;
}
@@ -188,27 +188,27 @@
axis2_http_server_start(axis2_transport_receiver_t *server, const axis2_env_t *env)
{
- axis2_http_server_impl_t *server_impl = NULL;
- axis2_http_worker_t *worker = NULL;
+ axis2_http_server_impl_t *server_impl = NULL;
+ axis2_http_worker_t *worker = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
- server_impl = AXIS2_INTF_TO_IMPL(server);
- server_impl->svr_thread = axis2_http_svr_thread_create(env,
- server_impl->port);
- if(NULL == server_impl->svr_thread)
- {
- return AXIS2_FAILURE;
- }
- worker = axis2_http_worker_create(env, server_impl->conf_ctx);
+
+ server_impl = AXIS2_INTF_TO_IMPL(server);
+ server_impl->svr_thread = axis2_http_svr_thread_create(env,
+ server_impl->port);
+ if(NULL == server_impl->svr_thread)
+ {
+ return AXIS2_FAILURE;
+ }
+ worker = axis2_http_worker_create(env, server_impl->conf_ctx);
AXIS2_HTTP_WORKER_SET_SVR_PORT(worker, env, server_impl->port);
- if(NULL == worker)
- {
- AXIS2_HTTP_SVR_THREAD_FREE(server_impl->svr_thread, env);
- return AXIS2_FAILURE;
- }
- AXIS2_LOG_INFO(env->log, "Starting HTTP server thread");
- AXIS2_HTTP_SVR_THREAD_SET_WORKER(server_impl->svr_thread, env, worker);
- AXIS2_HTTP_SVR_THREAD_RUN(server_impl->svr_thread, env);
+ if(NULL == worker)
+ {
+ AXIS2_HTTP_SVR_THREAD_FREE(server_impl->svr_thread, env);
+ return AXIS2_FAILURE;
+ }
+ AXIS2_LOG_INFO(env->log, "Starting HTTP server thread");
+ AXIS2_HTTP_SVR_THREAD_SET_WORKER(server_impl->svr_thread, env, worker);
+ AXIS2_HTTP_SVR_THREAD_RUN(server_impl->svr_thread, env);
return AXIS2_SUCCESS;
}
@@ -217,67 +217,67 @@
axis2_http_server_stop(axis2_transport_receiver_t *server, const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
- AXIS2_LOG_INFO(env->log, "Terminating HTTP server thread");
- if(NULL != AXIS2_INTF_TO_IMPL(server)->svr_thread)
- {
- AXIS2_HTTP_SVR_THREAD_DESTROY(AXIS2_INTF_TO_IMPL(server)->svr_thread,
- env);
- }
- AXIS2_LOG_INFO(env->log, "Successfully terminated HTTP server"
- " thread");
- return AXIS2_SUCCESS;
+
+ AXIS2_LOG_INFO(env->log, "Terminating HTTP server thread");
+ if(NULL != AXIS2_INTF_TO_IMPL(server)->svr_thread)
+ {
+ AXIS2_HTTP_SVR_THREAD_DESTROY(AXIS2_INTF_TO_IMPL(server)->svr_thread,
+ env);
+ }
+ AXIS2_LOG_INFO(env->log, "Successfully terminated HTTP server"
+ " thread");
+ return AXIS2_SUCCESS;
}
axis2_conf_ctx_t* AXIS2_CALL
axis2_http_server_get_conf_ctx (axis2_transport_receiver_t *server,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
- return AXIS2_INTF_TO_IMPL(server)->conf_ctx;
+ return AXIS2_INTF_TO_IMPL(server)->conf_ctx;
}
axis2_endpoint_ref_t* AXIS2_CALL
axis2_http_server_get_reply_to_epr(axis2_transport_receiver_t *server,
- const axis2_env_t *env, axis2_char_t *svc_name)
+ const axis2_env_t *env, axis2_char_t *svc_name)
{
- axis2_endpoint_ref_t *epr = NULL;
- axis2_char_t *host_address = NULL;
- axis2_char_t *svc_path = NULL;
- axis2_url_t *url = NULL;
+ axis2_endpoint_ref_t *epr = NULL;
+ axis2_char_t *host_address = NULL;
+ axis2_char_t *svc_path = NULL;
+ axis2_url_t *url = NULL;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, svc_name, NULL);
-
- host_address = "127.0.0.1"; /* TODO : get from axis2.xml */
- svc_path = AXIS2_STRACAT("/axis2/services/", svc_name, env);
- url = axis2_url_create(env, "http", host_address,
- AXIS2_INTF_TO_IMPL(server)->port, svc_path);
- AXIS2_FREE(env->allocator, svc_path);
- if(NULL == url)
- {
- return NULL;
- }
- epr = axis2_endpoint_ref_create(env, AXIS2_URL_TO_EXTERNAL_FORM(url, env));
- AXIS2_URL_FREE(url, env);
- return epr;
+
+ host_address = "127.0.0.1"; /* TODO : get from axis2.xml */
+ svc_path = AXIS2_STRACAT("/axis2/services/", svc_name, env);
+ url = axis2_url_create(env, "http", host_address,
+ AXIS2_INTF_TO_IMPL(server)->port, svc_path);
+ AXIS2_FREE(env->allocator, svc_path);
+ if(NULL == url)
+ {
+ return NULL;
+ }
+ epr = axis2_endpoint_ref_create(env, AXIS2_URL_TO_EXTERNAL_FORM(url, env));
+ AXIS2_URL_FREE(url, env);
+ return epr;
}
axis2_bool_t AXIS2_CALL
axis2_http_server_is_running (axis2_transport_receiver_t *server,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
- axis2_http_server_impl_t *server_impl = NULL;
+ axis2_http_server_impl_t *server_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- server_impl = AXIS2_INTF_TO_IMPL(server);
- if(NULL == server_impl->svr_thread)
- {
- return AXIS2_FALSE;
- }
- else
- {
- return AXIS2_HTTP_SVR_THREAD_IS_RUNNING(server_impl->svr_thread, env);
- }
- return AXIS2_FALSE;
+ server_impl = AXIS2_INTF_TO_IMPL(server);
+ if(NULL == server_impl->svr_thread)
+ {
+ return AXIS2_FALSE;
+ }
+ else
+ {
+ return AXIS2_HTTP_SVR_THREAD_IS_RUNNING(server_impl->svr_thread, env);
+ }
+ return AXIS2_FALSE;
}
/**
Modified: webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c?rev=411506&r1=411505&r2=411506&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c Sat Jun 3 20:09:08 2006
@@ -30,24 +30,24 @@
/**
* @brief HTTP Server Thread struct impl
- * Axis2 HTTP Server Thread impl
+ * Axis2 HTTP Server Thread impl
*/
typedef struct axis2_http_svr_thread_impl axis2_http_svr_thread_impl_t;
typedef struct axis2_http_svr_thd_args axis2_http_svr_thd_args_t;
struct axis2_http_svr_thread_impl
{
- axis2_http_svr_thread_t svr_thread;
- int listen_socket;
- axis2_bool_t stopped;
- axis2_http_worker_t *worker;
- int port;
+ axis2_http_svr_thread_t svr_thread;
+ int listen_socket;
+ axis2_bool_t stopped;
+ axis2_http_worker_t *worker;
+ int port;
};
struct axis2_http_svr_thd_args
{
- axis2_env_t *env;
- axis2_socket_t socket;
- axis2_http_worker_t *worker;
+ axis2_env_t *env;
+ axis2_socket_t socket;
+ axis2_http_worker_t *worker;
};
@@ -57,23 +57,23 @@
/***************************** Function headers *******************************/
axis2_status_t AXIS2_CALL
axis2_http_svr_thread_run(axis2_http_svr_thread_t *svr_thread,
- const axis2_env_t *env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_http_svr_thread_destroy(axis2_http_svr_thread_t *svr_thread,
- const axis2_env_t *env);
+ const axis2_env_t *env);
int AXIS2_CALL
axis2_http_svr_thread_get_local_port
- (axis2_http_svr_thread_t *svr_thread,
- const axis2_env_t *env);
+ (axis2_http_svr_thread_t *svr_thread,
+ const axis2_env_t *env);
axis2_bool_t AXIS2_CALL
axis2_http_svr_thread_is_running(axis2_http_svr_thread_t *svr_thread,
- const axis2_env_t *env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_http_svr_thread_set_worker(axis2_http_svr_thread_t *svr_thread,
- const axis2_env_t *env, axis2_http_worker_t *worker);
+ const axis2_env_t *env, axis2_http_worker_t *worker);
axis2_status_t AXIS2_CALL
axis2_http_svr_thread_free (axis2_http_svr_thread_t *svr_thread,
- const axis2_env_t *env);
+ const axis2_env_t *env);
AXIS2_EXTERN const axis2_env_t* AXIS2_CALL
init_thread_env(const axis2_env_t **system_env);
@@ -89,18 +89,18 @@
svr_thread_impl = (axis2_http_svr_thread_impl_t *)AXIS2_MALLOC
(env->allocator, sizeof(
- axis2_http_svr_thread_impl_t));
-
+ axis2_http_svr_thread_impl_t));
+
if(NULL == svr_thread_impl)
- {
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ {
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
- }
+ }
- svr_thread_impl->worker = NULL;
- svr_thread_impl->stopped = AXIS2_FALSE;
- svr_thread_impl->port = port;
- svr_thread_impl->listen_socket = axis2_network_handler_create_server_socket
+ svr_thread_impl->worker = NULL;
+ svr_thread_impl->stopped = AXIS2_FALSE;
+ svr_thread_impl->port = port;
+ svr_thread_impl->listen_socket = axis2_network_handler_create_server_socket
(env, svr_thread_impl->port);
svr_thread_impl->svr_thread.ops = NULL;
if(-1 == svr_thread_impl->listen_socket)
@@ -108,40 +108,40 @@
axis2_http_svr_thread_free((axis2_http_svr_thread_t*) svr_thread_impl,
env);
return NULL;
- }
+ }
svr_thread_impl->svr_thread.ops = AXIS2_MALLOC(env->allocator,
- sizeof(axis2_http_svr_thread_ops_t));
+ sizeof(axis2_http_svr_thread_ops_t));
if(NULL == svr_thread_impl->svr_thread.ops)
- {
- axis2_http_svr_thread_free((axis2_http_svr_thread_t*) svr_thread_impl,
- env);
+ {
+ axis2_http_svr_thread_free((axis2_http_svr_thread_t*) svr_thread_impl,
+ env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
- }
+ }
svr_thread_impl->svr_thread.ops->run = axis2_http_svr_thread_run;
svr_thread_impl->svr_thread.ops->destroy =
- axis2_http_svr_thread_destroy;
+ axis2_http_svr_thread_destroy;
svr_thread_impl->svr_thread.ops->get_local_port =
- axis2_http_svr_thread_get_local_port;
- svr_thread_impl->svr_thread.ops->is_running =
- axis2_http_svr_thread_is_running;
- svr_thread_impl->svr_thread.ops->set_worker =
- axis2_http_svr_thread_set_worker;
+ axis2_http_svr_thread_get_local_port;
+ svr_thread_impl->svr_thread.ops->is_running =
+ axis2_http_svr_thread_is_running;
+ svr_thread_impl->svr_thread.ops->set_worker =
+ axis2_http_svr_thread_set_worker;
svr_thread_impl->svr_thread.ops->free = axis2_http_svr_thread_free;
- return &(svr_thread_impl->svr_thread);
+ return &(svr_thread_impl->svr_thread);
}
axis2_status_t AXIS2_CALL
axis2_http_svr_thread_free (axis2_http_svr_thread_t *svr_thread,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
- axis2_http_svr_thread_impl_t *svr_thread_impl = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ axis2_http_svr_thread_impl_t *svr_thread_impl = NULL;
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
svr_thread_impl = AXIS2_INTF_TO_IMPL(svr_thread);
-
+
if(NULL != svr_thread_impl->worker)
{
AXIS2_URL_FREE(svr_thread_impl->worker, env);
@@ -152,98 +152,98 @@
axis2_network_handler_close_socket(env, svr_thread_impl->listen_socket);
svr_thread_impl->listen_socket = -1;
}
- svr_thread_impl->stopped = AXIS2_TRUE;
+ svr_thread_impl->stopped = AXIS2_TRUE;
if(NULL != svr_thread->ops)
AXIS2_FREE(env->allocator, svr_thread->ops);
- AXIS2_FREE(env->allocator, AXIS2_INTF_TO_IMPL(svr_thread));
- return AXIS2_SUCCESS;
+ AXIS2_FREE(env->allocator, AXIS2_INTF_TO_IMPL(svr_thread));
+ return AXIS2_SUCCESS;
}
axis2_status_t AXIS2_CALL
axis2_http_svr_thread_run(axis2_http_svr_thread_t *svr_thread,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
axis2_http_svr_thread_impl_t *svr_thread_impl = NULL;
-
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
svr_thread_impl = AXIS2_INTF_TO_IMPL(svr_thread);
-
- while(AXIS2_FALSE == svr_thread_impl->stopped)
- {
- int socket = -1;
- axis2_http_svr_thd_args_t *arg_list = NULL;
- axis2_thread_t *worker_thread = NULL;
-
- socket = axis2_network_handler_svr_socket_accept(env,
- svr_thread_impl->listen_socket);
- if(NULL == svr_thread_impl->worker)
- {
- AXIS2_LOG_WARNING(env->log, AXIS2_LOG_SI, "Worker not ready yet."
- " Cannot serve the request");
- axis2_network_handler_close_socket(env, socket);
- continue;
- }
- arg_list = AXIS2_MALLOC(env->allocator,
- sizeof(axis2_http_svr_thd_args_t));
- if(NULL == arg_list)
- {
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "Memory allocation error in the svr thread loop");
- continue;
- }
- arg_list->env = (axis2_env_t*)env;
- arg_list->socket = socket;
- arg_list->worker = svr_thread_impl->worker;
+
+ while(AXIS2_FALSE == svr_thread_impl->stopped)
+ {
+ int socket = -1;
+ axis2_http_svr_thd_args_t *arg_list = NULL;
+ axis2_thread_t *worker_thread = NULL;
+
+ socket = axis2_network_handler_svr_socket_accept(env,
+ svr_thread_impl->listen_socket);
+ if(NULL == svr_thread_impl->worker)
+ {
+ AXIS2_LOG_WARNING(env->log, AXIS2_LOG_SI, "Worker not ready yet."
+ " Cannot serve the request");
+ axis2_network_handler_close_socket(env, socket);
+ continue;
+ }
+ arg_list = AXIS2_MALLOC(env->allocator,
+ sizeof(axis2_http_svr_thd_args_t));
+ if(NULL == arg_list)
+ {
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "Memory allocation error in the svr thread loop");
+ continue;
+ }
+ arg_list->env = (axis2_env_t*)env;
+ arg_list->socket = socket;
+ arg_list->worker = svr_thread_impl->worker;
#ifdef AXIS2_SVR_MULTI_THREADED
- worker_thread = AXIS2_THREAD_POOL_GET_THREAD(env->thread_pool,
+ worker_thread = AXIS2_THREAD_POOL_GET_THREAD(env->thread_pool,
worker_func, (void*)arg_list);
- if(NULL == worker_thread)
- {
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Thread creation failed"
- "server thread loop");
- continue;
- }
- AXIS2_THREAD_POOL_THREAD_DETACH(env->thread_pool, worker_thread);
+ if(NULL == worker_thread)
+ {
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Thread creation failed"
+ "server thread loop");
+ continue;
+ }
+ AXIS2_THREAD_POOL_THREAD_DETACH(env->thread_pool, worker_thread);
#else
- worker_func(NULL, (void*)arg_list);
+ worker_func(NULL, (void*)arg_list);
#endif
- }
+ }
return AXIS2_SUCCESS;
}
axis2_status_t AXIS2_CALL
axis2_http_svr_thread_destroy(axis2_http_svr_thread_t *svr_thread,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
- axis2_http_svr_thread_impl_t *svr_thread_impl = NULL;
-
+ axis2_http_svr_thread_impl_t *svr_thread_impl = NULL;
+
AXIS2_ENV_CHECK(env, AXIS2_CRTICAL_FAILURE);
-
- svr_thread_impl = AXIS2_INTF_TO_IMPL(svr_thread);
- if(AXIS2_TRUE == svr_thread_impl->stopped)
- {
- return AXIS2_SUCCESS;
- }
- svr_thread_impl->stopped = AXIS2_TRUE;
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Terminating HTTP server "
- "thread.");
- if(svr_thread_impl->listen_socket)
- {
- axis2_network_handler_close_socket(env, svr_thread_impl->listen_socket);
- svr_thread_impl->listen_socket = -1;
- }
- /* TODO: stop all the child threads */
- return AXIS2_SUCCESS;
+
+ svr_thread_impl = AXIS2_INTF_TO_IMPL(svr_thread);
+ if(AXIS2_TRUE == svr_thread_impl->stopped)
+ {
+ return AXIS2_SUCCESS;
+ }
+ svr_thread_impl->stopped = AXIS2_TRUE;
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Terminating HTTP server "
+ "thread.");
+ if(svr_thread_impl->listen_socket)
+ {
+ axis2_network_handler_close_socket(env, svr_thread_impl->listen_socket);
+ svr_thread_impl->listen_socket = -1;
+ }
+ /* TODO: stop all the child threads */
+ return AXIS2_SUCCESS;
}
int AXIS2_CALL
axis2_http_svr_thread_get_local_port
- (axis2_http_svr_thread_t *svr_thread,
- const axis2_env_t *env)
+ (axis2_http_svr_thread_t *svr_thread,
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_CRTICAL_FAILURE);
return AXIS2_INTF_TO_IMPL(svr_thread)->port;
@@ -251,20 +251,20 @@
axis2_bool_t AXIS2_CALL
axis2_http_svr_thread_is_running(axis2_http_svr_thread_t *svr_thread,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- return AXIS2_INTF_TO_IMPL(svr_thread)->port;
+ return AXIS2_INTF_TO_IMPL(svr_thread)->port;
}
axis2_status_t AXIS2_CALL
axis2_http_svr_thread_set_worker(axis2_http_svr_thread_t *svr_thread,
- const axis2_env_t *env, axis2_http_worker_t *worker)
+ const axis2_env_t *env, axis2_http_worker_t *worker)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK(env->error, worker, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, worker, AXIS2_FAILURE);
AXIS2_INTF_TO_IMPL(svr_thread)->worker = worker;
- return AXIS2_SUCCESS;
+ return AXIS2_SUCCESS;
}
@@ -274,77 +274,77 @@
void * AXIS2_THREAD_FUNC
worker_func(axis2_thread_t *thd, void *data)
{
- struct AXIS2_PLATFORM_TIMEB t1, t2;
- axis2_simple_http_svr_conn_t *svr_conn = NULL;
- axis2_http_simple_request_t *request = NULL;
- int millisecs = 0;
- double secs = 0;
- axis2_http_worker_t *tmp = NULL;
- axis2_status_t status = AXIS2_FAILURE;
- axis2_env_t *env = NULL;
- axis2_socket_t socket;
- axis2_env_t *thread_env = NULL;
- axis2_http_svr_thd_args_t *arg_list = NULL;
+ struct AXIS2_PLATFORM_TIMEB t1, t2;
+ axis2_simple_http_svr_conn_t *svr_conn = NULL;
+ axis2_http_simple_request_t *request = NULL;
+ int millisecs = 0;
+ double secs = 0;
+ axis2_http_worker_t *tmp = NULL;
+ axis2_status_t status = AXIS2_FAILURE;
+ axis2_env_t *env = NULL;
+ axis2_socket_t socket;
+ axis2_env_t *thread_env = NULL;
+ axis2_http_svr_thd_args_t *arg_list = NULL;
#ifndef WIN32
#ifdef AXIS2_SVR_MULTI_THREADED
signal(SIGPIPE, SIG_IGN);
#endif
#endif
-
- arg_list = (axis2_http_svr_thd_args_t*)data;
- if(NULL == arg_list)
- {
- return NULL;
- }
- AXIS2_PLATFORM_GET_TIME_IN_MILLIS(&t1);
- env = arg_list->env;
- thread_env = axis2_init_thread_env(env);
- socket = arg_list->socket;
- svr_conn = axis2_simple_http_svr_conn_create(thread_env, socket);
- AXIS2_SIMPLE_HTTP_SVR_CONN_SET_RCV_TIMEOUT(svr_conn, thread_env,
- axis2_http_socket_read_timeout);
- request = AXIS2_SIMPLE_HTTP_SVR_CONN_READ_REQUEST(svr_conn, thread_env);
- tmp = arg_list->worker;
- status = AXIS2_HTTP_WORKER_PROCESS_REQUEST(tmp, thread_env, svr_conn,
- request);
- AXIS2_SIMPLE_HTTP_SVR_CONN_FREE(svr_conn, thread_env);
+
+ arg_list = (axis2_http_svr_thd_args_t*)data;
+ if(NULL == arg_list)
+ {
+ return NULL;
+ }
+ AXIS2_PLATFORM_GET_TIME_IN_MILLIS(&t1);
+ env = arg_list->env;
+ thread_env = axis2_init_thread_env(env);
+ socket = arg_list->socket;
+ svr_conn = axis2_simple_http_svr_conn_create(thread_env, socket);
+ AXIS2_SIMPLE_HTTP_SVR_CONN_SET_RCV_TIMEOUT(svr_conn, thread_env,
+ axis2_http_socket_read_timeout);
+ request = AXIS2_SIMPLE_HTTP_SVR_CONN_READ_REQUEST(svr_conn, thread_env);
+ tmp = arg_list->worker;
+ status = AXIS2_HTTP_WORKER_PROCESS_REQUEST(tmp, thread_env, svr_conn,
+ request);
+ AXIS2_SIMPLE_HTTP_SVR_CONN_FREE(svr_conn, thread_env);
if (request)
AXIS2_HTTP_SIMPLE_REQUEST_FREE(request, thread_env);
- AXIS2_FREE(thread_env->allocator, arg_list);
- AXIS2_PLATFORM_GET_TIME_IN_MILLIS(&t2);
- millisecs = t2.millitm - t1.millitm;
- secs = difftime(t2.time, t1.time);
- if(millisecs < 0)
- {
- millisecs += 1000;
- secs--;
- }
- secs += millisecs/1000.0;
-
- if(status == AXIS2_SUCCESS)
- {
+ AXIS2_FREE(thread_env->allocator, arg_list);
+ AXIS2_PLATFORM_GET_TIME_IN_MILLIS(&t2);
+ millisecs = t2.millitm - t1.millitm;
+ secs = difftime(t2.time, t1.time);
+ if(millisecs < 0)
+ {
+ millisecs += 1000;
+ secs--;
+ }
+ secs += millisecs/1000.0;
+
+ if(status == AXIS2_SUCCESS)
+ {
#if defined(WIN32)
- AXIS2_LOG_INFO(thread_env->log, "Request served successfully");
-#else
- AXIS2_LOG_INFO(thread_env->log, "Request served in %.3f seconds", secs);
-#endif
- }
- else
- {
-#if defined(WIN32)
- AXIS2_LOG_WARNING(thread_env->log, AXIS2_LOG_SI,
- "Error occured in processing request ");
+ AXIS2_LOG_INFO(thread_env->log, "Request served successfully");
+#else
+ AXIS2_LOG_INFO(thread_env->log, "Request served in %.3f seconds", secs);
+#endif
+ }
+ else
+ {
+#if defined(WIN32)
+ AXIS2_LOG_WARNING(thread_env->log, AXIS2_LOG_SI,
+ "Error occured in processing request ");
#else
- AXIS2_LOG_WARNING(thread_env->log, AXIS2_LOG_SI,
- "Error occured in processing request (%.3f seconds)",
- secs);
-#endif
- }
+ AXIS2_LOG_WARNING(thread_env->log, AXIS2_LOG_SI,
+ "Error occured in processing request (%.3f seconds)",
+ secs);
+#endif
+ }
axis2_env_free_masked(thread_env, 0x2);
/*axis2_xml_reader_cleanup();*/
#ifdef AXIS2_SVR_MULTI_THREADED
- AXIS2_THREAD_POOL_EXIT_THREAD(env->thread_pool, thd);
+ AXIS2_THREAD_POOL_EXIT_THREAD(env->thread_pool, thd);
#endif
- return NULL;
+ return NULL;
}
Modified: webservices/axis2/trunk/c/modules/core/transport/http/receiver/simple_http_svr_conn.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/receiver/simple_http_svr_conn.c?rev=411506&r1=411505&r2=411506&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/receiver/simple_http_svr_conn.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/receiver/simple_http_svr_conn.c Sat Jun 3 20:09:08 2006
@@ -43,7 +43,7 @@
axis2_status_t AXIS2_CALL
axis2_simple_http_svr_conn_close(axis2_simple_http_svr_conn_t *svr_conn,
- const axis2_env_t *env);
+ const axis2_env_t *env);
axis2_bool_t AXIS2_CALL
axis2_simple_http_svr_conn_is_open(axis2_simple_http_svr_conn_t *svr_conn,
@@ -75,12 +75,12 @@
(axis2_simple_http_svr_conn_t *svr_conn,
const axis2_env_t *env,
axis2_http_simple_response_t *response);
-
+
axis2_status_t AXIS2_CALL
axis2_simple_http_svr_conn_set_rcv_timeout
- (axis2_simple_http_svr_conn_t *svr_conn,
- const axis2_env_t *env, int timeout);
-
+ (axis2_simple_http_svr_conn_t *svr_conn,
+ const axis2_env_t *env, int timeout);
+
axis2_status_t AXIS2_CALL
axis2_simple_http_svr_conn_set_snd_timeout
(axis2_simple_http_svr_conn_t *svr_conn,
@@ -118,18 +118,18 @@
svr_conn_impl->socket = sockfd;
svr_conn_impl->stream = NULL;
svr_conn_impl->keep_alive = AXIS2_FALSE;
-
- if(-1 != svr_conn_impl->socket)
- {
- svr_conn_impl->stream = axis2_stream_create_socket(env,
- svr_conn_impl->socket);
- if(NULL == svr_conn_impl->stream)
- {
- axis2_simple_http_svr_conn_free((axis2_simple_http_svr_conn_t *)
+
+ if(-1 != svr_conn_impl->socket)
+ {
+ svr_conn_impl->stream = axis2_stream_create_socket(env,
+ svr_conn_impl->socket);
+ if(NULL == svr_conn_impl->stream)
+ {
+ axis2_simple_http_svr_conn_free((axis2_simple_http_svr_conn_t *)
svr_conn_impl, env);
- return NULL;
- }
- }
+ return NULL;
+ }
+ }
svr_conn_impl->svr_conn.ops = AXIS2_MALLOC(env->allocator,
sizeof(axis2_simple_http_svr_conn_ops_t));
if(NULL == svr_conn_impl->svr_conn.ops)
@@ -153,10 +153,10 @@
axis2_simple_http_svr_conn_read_request;
svr_conn_impl->svr_conn.ops->write_response =
axis2_simple_http_svr_conn_write_response;
- svr_conn_impl->svr_conn.ops->set_rcv_timeout =
- axis2_simple_http_svr_conn_set_rcv_timeout;
- svr_conn_impl->svr_conn.ops->set_snd_timeout =
- axis2_simple_http_svr_conn_set_snd_timeout;
+ svr_conn_impl->svr_conn.ops->set_rcv_timeout =
+ axis2_simple_http_svr_conn_set_rcv_timeout;
+ svr_conn_impl->svr_conn.ops->set_snd_timeout =
+ axis2_simple_http_svr_conn_set_snd_timeout;
svr_conn_impl->svr_conn.ops->get_svr_ip =
axis2_simple_http_svr_conn_get_svr_ip;
svr_conn_impl->svr_conn.ops->free = axis2_simple_http_svr_conn_free;
@@ -172,7 +172,7 @@
AXIS2_INTF_TO_IMPL(svr_conn);
axis2_simple_http_svr_conn_close(svr_conn, env);
- if(NULL != svr_conn->ops)
+ if(NULL != svr_conn->ops)
{
AXIS2_FREE(env->allocator, svr_conn->ops);
svr_conn->ops = NULL;
@@ -192,11 +192,11 @@
axis2_simple_http_svr_conn_impl_t *svr_conn_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
svr_conn_impl = AXIS2_INTF_TO_IMPL(svr_conn);
-
- AXIS2_STREAM_FREE(svr_conn_impl->stream, env);
+
+ AXIS2_STREAM_FREE(svr_conn_impl->stream, env);
if(-1 != svr_conn_impl->socket)
{
- axis2_network_handler_close_socket(env, svr_conn_impl->socket);
+ axis2_network_handler_close_socket(env, svr_conn_impl->socket);
svr_conn_impl->socket = -1;
}
return AXIS2_SUCCESS;
@@ -267,33 +267,33 @@
axis2_simple_http_svr_conn_read_request(axis2_simple_http_svr_conn_t *svr_conn,
const axis2_env_t *env)
{
- axis2_char_t str_line[1024];
- axis2_char_t tmp_buf[3];
- axis2_simple_http_svr_conn_impl_t *svr_conn_impl = NULL;
- int read = -1;
- axis2_bool_t end_of_line = AXIS2_FALSE;
- axis2_bool_t end_of_headers = AXIS2_FALSE;
- axis2_http_request_line_t *request_line = NULL;
- axis2_http_simple_request_t *request = NULL;
-
+ axis2_char_t str_line[1024];
+ axis2_char_t tmp_buf[3];
+ axis2_simple_http_svr_conn_impl_t *svr_conn_impl = NULL;
+ int read = -1;
+ axis2_bool_t end_of_line = AXIS2_FALSE;
+ axis2_bool_t end_of_headers = AXIS2_FALSE;
+ axis2_http_request_line_t *request_line = NULL;
+ axis2_http_simple_request_t *request = NULL;
+
AXIS2_ENV_CHECK(env, NULL);
-
+
svr_conn_impl = AXIS2_INTF_TO_IMPL(svr_conn);
- memset(str_line, 0, 1024);
- while((read = AXIS2_STREAM_READ(svr_conn_impl->stream, env, tmp_buf,
- 1)) > 0)
- {
- tmp_buf[read] = '\0';
- strcat(str_line, tmp_buf);
- if(0 != strstr(str_line, AXIS2_HTTP_CRLF))
- {
- end_of_line = AXIS2_TRUE;
- }
- if(AXIS2_TRUE == end_of_line)
- {
- break;
- }
- }
+ memset(str_line, 0, 1024);
+ while((read = AXIS2_STREAM_READ(svr_conn_impl->stream, env, tmp_buf,
+ 1)) > 0)
+ {
+ tmp_buf[read] = '\0';
+ strcat(str_line, tmp_buf);
+ if(0 != strstr(str_line, AXIS2_HTTP_CRLF))
+ {
+ end_of_line = AXIS2_TRUE;
+ }
+ if(AXIS2_TRUE == end_of_line)
+ {
+ break;
+ }
+ }
if(NULL != str_line)
{
if(0 != AXIS2_STRNCASECMP(str_line, "GET", 3) && 0 !=
@@ -309,174 +309,174 @@
return NULL;
}
}
- request_line = axis2_http_request_line_parse_line(env, str_line);
- if(NULL == request_line)
- {
- AXIS2_ERROR_SET(env->error,
- AXIS2_ERROR_INVALID_HTTP_HEADER_START_LINE,
- AXIS2_FAILURE);
- return NULL;
- }
- request = axis2_http_simple_request_create(env, request_line, NULL , 0,
- svr_conn_impl->stream);
- /* now read the headers */
- memset(str_line, 0, 1024);
- end_of_line = AXIS2_FALSE;
- while(AXIS2_FALSE == end_of_headers)
- {
- while((read = AXIS2_STREAM_READ(svr_conn_impl->stream, env, tmp_buf,
- 1)) > 0)
- {
- tmp_buf[read] = '\0';
- strcat(str_line, tmp_buf);
- if(0 != strstr(str_line, AXIS2_HTTP_CRLF))
- {
- end_of_line = AXIS2_TRUE;
- break;
- }
- }
- if(AXIS2_TRUE == end_of_line)
- {
- if(0 == AXIS2_STRCMP(str_line, AXIS2_HTTP_CRLF))
- {
- end_of_headers = AXIS2_TRUE;
- }
- else
- {
- axis2_http_header_t *tmp_header =
- axis2_http_header_create_by_str(env, str_line);
- memset(str_line, 0, 1024);
- if(NULL != tmp_header)
- {
- AXIS2_HTTP_SIMPLE_REQUEST_ADD_HEADER(request, env,
- tmp_header);
- }
- }
- }
- end_of_line = AXIS2_FALSE;
- }
+ request_line = axis2_http_request_line_parse_line(env, str_line);
+ if(NULL == request_line)
+ {
+ AXIS2_ERROR_SET(env->error,
+ AXIS2_ERROR_INVALID_HTTP_HEADER_START_LINE,
+ AXIS2_FAILURE);
+ return NULL;
+ }
+ request = axis2_http_simple_request_create(env, request_line, NULL , 0,
+ svr_conn_impl->stream);
+ /* now read the headers */
+ memset(str_line, 0, 1024);
+ end_of_line = AXIS2_FALSE;
+ while(AXIS2_FALSE == end_of_headers)
+ {
+ while((read = AXIS2_STREAM_READ(svr_conn_impl->stream, env, tmp_buf,
+ 1)) > 0)
+ {
+ tmp_buf[read] = '\0';
+ strcat(str_line, tmp_buf);
+ if(0 != strstr(str_line, AXIS2_HTTP_CRLF))
+ {
+ end_of_line = AXIS2_TRUE;
+ break;
+ }
+ }
+ if(AXIS2_TRUE == end_of_line)
+ {
+ if(0 == AXIS2_STRCMP(str_line, AXIS2_HTTP_CRLF))
+ {
+ end_of_headers = AXIS2_TRUE;
+ }
+ else
+ {
+ axis2_http_header_t *tmp_header =
+ axis2_http_header_create_by_str(env, str_line);
+ memset(str_line, 0, 1024);
+ if(NULL != tmp_header)
+ {
+ AXIS2_HTTP_SIMPLE_REQUEST_ADD_HEADER(request, env,
+ tmp_header);
+ }
+ }
+ }
+ end_of_line = AXIS2_FALSE;
+ }
return request;
}
axis2_status_t AXIS2_CALL
axis2_simple_http_svr_conn_write_response
- (axis2_simple_http_svr_conn_t *svr_conn,
- const axis2_env_t *env,
- axis2_http_simple_response_t *response)
-{
- axis2_http_response_writer_t *response_writer = NULL;
- axis2_simple_http_svr_conn_impl_t *svr_conn_impl = NULL;
- axis2_array_list_t *headers = NULL;
- axis2_stream_t *response_stream = NULL;
- axis2_char_t *response_body = NULL;
- int body_size = 0;
- int i = 0;
- axis2_http_header_t *enc_header = NULL;
- axis2_bool_t chuked_encoding = AXIS2_FALSE;
- axis2_char_t *status_line = NULL;
-
-
+ (axis2_simple_http_svr_conn_t *svr_conn,
+ const axis2_env_t *env,
+ axis2_http_simple_response_t *response)
+{
+ axis2_http_response_writer_t *response_writer = NULL;
+ axis2_simple_http_svr_conn_impl_t *svr_conn_impl = NULL;
+ axis2_array_list_t *headers = NULL;
+ axis2_stream_t *response_stream = NULL;
+ axis2_char_t *response_body = NULL;
+ int body_size = 0;
+ int i = 0;
+ axis2_http_header_t *enc_header = NULL;
+ axis2_bool_t chuked_encoding = AXIS2_FALSE;
+ axis2_char_t *status_line = NULL;
+
+
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK(env->error, response, AXIS2_FAILURE);
-
- svr_conn_impl = AXIS2_INTF_TO_IMPL(svr_conn);
- response_writer = axis2_http_response_writer_create(env,
- svr_conn_impl->stream);
- if(NULL == response_writer)
- {
- return AXIS2_FAILURE;
- }
- enc_header = AXIS2_HTTP_SIMPLE_RESPONSE_GET_FIRST_HEADER(response, env,
- AXIS2_HTTP_HEADER_TRANSFER_ENCODING);
- if(NULL != enc_header)
- {
- axis2_char_t *enc_value = AXIS2_HTTP_HEADER_GET_VALUE(enc_header, env);
- if(NULL != enc_value)
- {
- if(0 == AXIS2_STRCMP(enc_value,
- AXIS2_HTTP_HEADER_TRANSFER_ENCODING_CHUNKED))
- {
- chuked_encoding = AXIS2_TRUE;
- /* remove the content length header */
- if(AXIS2_TRUE == AXIS2_HTTP_SIMPLE_RESPONSE_CONTAINS_HEADER(
- response,env, AXIS2_HTTP_HEADER_CONTENT_LENGTH))
- {
- AXIS2_HTTP_SIMPLE_RESPONSE_REMOVE_HEADERS(response, env,
- AXIS2_HTTP_HEADER_CONTENT_LENGTH);
- }
- }
- }
- }
- status_line = AXIS2_HTTP_SIMPLE_RESPONSE_GET_STATUS_LINE(response, env);
- if(NULL == status_line)
- {
- AXIS2_ERROR_SET(env->error,
- AXIS2_ERROR_INVALID_HTTP_HEADER_START_LINE,
- AXIS2_FAILURE);
- AXIS2_HTTP_RESPONSE_WRITER_FREE(response_writer, env);
- response_writer = NULL;
- return AXIS2_FAILURE;
- }
- AXIS2_HTTP_RESPONSE_WRITER_PRINT_STR(response_writer, env, status_line);
- headers = AXIS2_HTTP_SIMPLE_RESPONSE_GET_HEADERS(response, env);
-
- if(NULL != headers)
- {
- for(i = 0; i < AXIS2_ARRAY_LIST_SIZE(headers, env); i++)
- {
- axis2_http_header_t *header = NULL;
- header = (axis2_http_header_t *)AXIS2_ARRAY_LIST_GET(headers, env,
- i);
- if(NULL != header)
- {
+ AXIS2_PARAM_CHECK(env->error, response, AXIS2_FAILURE);
+
+ svr_conn_impl = AXIS2_INTF_TO_IMPL(svr_conn);
+ response_writer = axis2_http_response_writer_create(env,
+ svr_conn_impl->stream);
+ if(NULL == response_writer)
+ {
+ return AXIS2_FAILURE;
+ }
+ enc_header = AXIS2_HTTP_SIMPLE_RESPONSE_GET_FIRST_HEADER(response, env,
+ AXIS2_HTTP_HEADER_TRANSFER_ENCODING);
+ if(NULL != enc_header)
+ {
+ axis2_char_t *enc_value = AXIS2_HTTP_HEADER_GET_VALUE(enc_header, env);
+ if(NULL != enc_value)
+ {
+ if(0 == AXIS2_STRCMP(enc_value,
+ AXIS2_HTTP_HEADER_TRANSFER_ENCODING_CHUNKED))
+ {
+ chuked_encoding = AXIS2_TRUE;
+ /* remove the content length header */
+ if(AXIS2_TRUE == AXIS2_HTTP_SIMPLE_RESPONSE_CONTAINS_HEADER(
+ response,env, AXIS2_HTTP_HEADER_CONTENT_LENGTH))
+ {
+ AXIS2_HTTP_SIMPLE_RESPONSE_REMOVE_HEADERS(response, env,
+ AXIS2_HTTP_HEADER_CONTENT_LENGTH);
+ }
+ }
+ }
+ }
+ status_line = AXIS2_HTTP_SIMPLE_RESPONSE_GET_STATUS_LINE(response, env);
+ if(NULL == status_line)
+ {
+ AXIS2_ERROR_SET(env->error,
+ AXIS2_ERROR_INVALID_HTTP_HEADER_START_LINE,
+ AXIS2_FAILURE);
+ AXIS2_HTTP_RESPONSE_WRITER_FREE(response_writer, env);
+ response_writer = NULL;
+ return AXIS2_FAILURE;
+ }
+ AXIS2_HTTP_RESPONSE_WRITER_PRINT_STR(response_writer, env, status_line);
+ headers = AXIS2_HTTP_SIMPLE_RESPONSE_GET_HEADERS(response, env);
+
+ if(NULL != headers)
+ {
+ for(i = 0; i < AXIS2_ARRAY_LIST_SIZE(headers, env); i++)
+ {
+ axis2_http_header_t *header = NULL;
+ header = (axis2_http_header_t *)AXIS2_ARRAY_LIST_GET(headers, env,
+ i);
+ if(NULL != header)
+ {
axis2_char_t *header_ext_form =
AXIS2_HTTP_HEADER_TO_EXTERNAL_FORM(
(axis2_http_header_t*)header, env);
- AXIS2_HTTP_RESPONSE_WRITER_PRINT_STR(response_writer, env,
- header_ext_form);
+ AXIS2_HTTP_RESPONSE_WRITER_PRINT_STR(response_writer, env,
+ header_ext_form);
AXIS2_FREE(env->allocator, header_ext_form);
- }
- }
+ }
+ }
}
- AXIS2_HTTP_RESPONSE_WRITER_PRINTLN(response_writer, env);
-
- response_stream = AXIS2_HTTP_SIMPLE_RESPONSE_GET_BODY(response, env);
- body_size = AXIS2_HTTP_SIMPLE_RESPONSE_GET_BODY_BYTES(response, env,
- &response_body);
- if(body_size <= 0)
- {
+ AXIS2_HTTP_RESPONSE_WRITER_PRINTLN(response_writer, env);
+
+ response_stream = AXIS2_HTTP_SIMPLE_RESPONSE_GET_BODY(response, env);
+ body_size = AXIS2_HTTP_SIMPLE_RESPONSE_GET_BODY_BYTES(response, env,
+ &response_body);
+ if(body_size <= 0)
+ {
AXIS2_HTTP_RESPONSE_WRITER_FREE(response_writer, env);
- return AXIS2_SUCCESS;
- }
- if(AXIS2_FALSE == chuked_encoding)
- {
- axis2_status_t write_stat = AXIS2_FAILURE;
- write_stat = AXIS2_HTTP_RESPONSE_WRITER_PRINTLN_STR(response_writer,
- env, response_body);
- if(AXIS2_SUCCESS != write_stat)
- {
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_WRITING_RESPONSE,
- AXIS2_FAILURE);
+ return AXIS2_SUCCESS;
+ }
+ if(AXIS2_FALSE == chuked_encoding)
+ {
+ axis2_status_t write_stat = AXIS2_FAILURE;
+ write_stat = AXIS2_HTTP_RESPONSE_WRITER_PRINTLN_STR(response_writer,
+ env, response_body);
+ if(AXIS2_SUCCESS != write_stat)
+ {
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_WRITING_RESPONSE,
+ AXIS2_FAILURE);
AXIS2_HTTP_RESPONSE_WRITER_FREE(response_writer, env);
- return AXIS2_FAILURE;
- }
- }
- else
- {
- axis2_http_chunked_stream_t *chunked_stream = NULL;
- int left = body_size;
- chunked_stream = axis2_http_chunked_stream_create(env,
- svr_conn_impl->stream);
- while(left > 0)
- {
- left -= AXIS2_HTTP_CHUNKED_STREAM_WRITE(chunked_stream, env,
- response_body, body_size);
- }
- AXIS2_HTTP_CHUNKED_STREAM_WRITE_LAST_CHUNK(chunked_stream, env);
- AXIS2_HTTP_CHUNKED_STREAM_FREE(chunked_stream, env);
- }
+ return AXIS2_FAILURE;
+ }
+ }
+ else
+ {
+ axis2_http_chunked_stream_t *chunked_stream = NULL;
+ int left = body_size;
+ chunked_stream = axis2_http_chunked_stream_create(env,
+ svr_conn_impl->stream);
+ while(left > 0)
+ {
+ left -= AXIS2_HTTP_CHUNKED_STREAM_WRITE(chunked_stream, env,
+ response_body, body_size);
+ }
+ AXIS2_HTTP_CHUNKED_STREAM_WRITE_LAST_CHUNK(chunked_stream, env);
+ AXIS2_HTTP_CHUNKED_STREAM_FREE(chunked_stream, env);
+ }
AXIS2_FREE(env->allocator, response_body);
AXIS2_HTTP_RESPONSE_WRITER_FREE(response_writer, env);
return AXIS2_SUCCESS;
@@ -484,26 +484,26 @@
axis2_status_t AXIS2_CALL
axis2_simple_http_svr_conn_set_rcv_timeout
- (axis2_simple_http_svr_conn_t *svr_conn,
- const axis2_env_t *env, int timeout)
+ (axis2_simple_http_svr_conn_t *svr_conn,
+ const axis2_env_t *env, int timeout)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- return axis2_network_handler_set_sock_option(env,
- AXIS2_INTF_TO_IMPL(svr_conn)->socket, SO_RCVTIMEO,
- timeout);
-
-
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ return axis2_network_handler_set_sock_option(env,
+ AXIS2_INTF_TO_IMPL(svr_conn)->socket, SO_RCVTIMEO,
+ timeout);
+
+
}
-
+
axis2_status_t AXIS2_CALL
axis2_simple_http_svr_conn_set_snd_timeout
(axis2_simple_http_svr_conn_t *svr_conn,
const axis2_env_t *env, int timeout)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- return axis2_network_handler_set_sock_option(env,
- AXIS2_INTF_TO_IMPL(svr_conn)->socket, SO_SNDTIMEO,
- timeout);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ return axis2_network_handler_set_sock_option(env,
+ AXIS2_INTF_TO_IMPL(svr_conn)->socket, SO_SNDTIMEO,
+ timeout);
}
axis2_char_t* AXIS2_CALL
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org