Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 75104 invoked from network); 13 Jan 2006 07:50:57 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 13 Jan 2006 07:50:57 -0000 Received: (qmail 56822 invoked by uid 500); 13 Jan 2006 07:50:55 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 56523 invoked by uid 500); 13 Jan 2006 07:50:52 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 56508 invoked by uid 500); 13 Jan 2006 07:50:52 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 56497 invoked by uid 99); 13 Jan 2006 07:50:52 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Jan 2006 23:50:52 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 12 Jan 2006 23:50:51 -0800 Received: (qmail 74852 invoked by uid 65534); 13 Jan 2006 07:50:30 -0000 Message-ID: <20060113075030.74851.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r368627 - in /webservices/axis2/trunk/c/include: axis2_error.h axis2_http_client.h axis2_http_simple_request.h axis2_http_worker.h axis2_network_handler.h axis2_simple_http_svr_conn.h axis2_soap_over_http_sender.h Date: Fri, 13 Jan 2006 07:50:27 -0000 To: axis2-cvs@ws.apache.org From: samisa@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: samisa Date: Thu Jan 12 23:50:12 2006 New Revision: 368627 URL: http://svn.apache.org/viewcvs?rev=368627&view=rev Log: Implemented some funtions(which were TODOs) Modified: webservices/axis2/trunk/c/include/axis2_error.h webservices/axis2/trunk/c/include/axis2_http_client.h webservices/axis2/trunk/c/include/axis2_http_simple_request.h webservices/axis2/trunk/c/include/axis2_http_worker.h webservices/axis2/trunk/c/include/axis2_network_handler.h webservices/axis2/trunk/c/include/axis2_simple_http_svr_conn.h webservices/axis2/trunk/c/include/axis2_soap_over_http_sender.h Modified: webservices/axis2/trunk/c/include/axis2_error.h URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_error.h?rev=368627&r1=368626&r2=368627&view=diff ============================================================================== --- webservices/axis2/trunk/c/include/axis2_error.h (original) +++ webservices/axis2/trunk/c/include/axis2_error.h Thu Jan 12 23:50:12 2006 @@ -405,7 +405,12 @@ AXIS2_ERROR_MULTIPLE_ROLE_ELEMENTS_ENCOUNTERED, - AXIS2_ERROR_ROLE_ELEMENT_SHOULD_HAVE_A_TEXT + AXIS2_ERROR_ROLE_ELEMENT_SHOULD_HAVE_A_TEXT, + + /* OM output is NULL */ + AXIS2_ERROR_NULL_OM_OUTPUT, + /* We got a NULL strem in the response body */ + AXIS2_ERROR_NULL_STREAM_IN_RESPONSE_BODY }; /** @} */ Modified: webservices/axis2/trunk/c/include/axis2_http_client.h URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_http_client.h?rev=368627&r1=368626&r2=368627&view=diff ============================================================================== --- webservices/axis2/trunk/c/include/axis2_http_client.h (original) +++ webservices/axis2/trunk/c/include/axis2_http_client.h Thu Jan 12 23:50:12 2006 @@ -99,8 +99,8 @@ ((client)->ops->set_url(client, env, url)) #define AXIS2_HTTP_CLIENT_GET_URL(client, env) \ ((client)->ops->get_url(client, env)) -#define AXIS2_HTTP_CLIENT_SET_TIMEOUT(client, env, url, timeout) \ - ((client)->ops->set_url(client, env, url, \ +#define AXIS2_HTTP_CLIENT_SET_TIMEOUT(client, env, timeout) \ + ((client)->ops->set_timeout(client, env,\ timeout)) #define AXIS2_HTTP_CLIENT_GET_TIMEOUT(client, env) \ ((client)->ops->get_url(client, env)) Modified: webservices/axis2/trunk/c/include/axis2_http_simple_request.h URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_http_simple_request.h?rev=368627&r1=368626&r2=368627&view=diff ============================================================================== --- webservices/axis2/trunk/c/include/axis2_http_simple_request.h (original) +++ webservices/axis2/trunk/c/include/axis2_http_simple_request.h Thu Jan 12 23:50:12 2006 @@ -99,6 +99,10 @@ axis2_ssize_t (AXIS2_CALL *get_body_bytes) (axis2_http_simple_request_t *simple_request, axis2_env_t **env, char **buf); + + axis2_status_t (AXIS2_CALL *set_body_string) + (axis2_http_simple_request_t *simple_request, + axis2_env_t **env, axis2_char_t *str); axis2_status_t (AXIS2_CALL *free) (axis2_http_simple_request_t *simple_request, @@ -162,6 +166,9 @@ #define AXIS2_HTTP_SIMPLE_REQUEST_GET_BODY_BYTES(simple_request, env, buf)\ ((simple_request)->ops->get_body_bytes\ (simple_request, env, buf)) +#define AXIS2_HTTP_SIMPLE_REQUEST_SET_BODY_STRING(simple_request, env, str)\ + ((simple_request)->ops->set_body_string\ + (simple_request, env, str)) #define AXIS2_HTTP_SIMPLE_REQUEST_FREE(simple_request, env) \ ((simple_request)->ops->free(simple_request, env)) Modified: webservices/axis2/trunk/c/include/axis2_http_worker.h URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_http_worker.h?rev=368627&r1=368626&r2=368627&view=diff ============================================================================== --- webservices/axis2/trunk/c/include/axis2_http_worker.h (original) +++ webservices/axis2/trunk/c/include/axis2_http_worker.h Thu Jan 12 23:50:12 2006 @@ -79,12 +79,10 @@ /************************** Start of function macros **************************/ -#define AXIS2_HTTP_WORKER_PROCESS_REQUEST\ - (http_worker, env, svr_conn, simple_request) \ - ((http_worker)->ops->process_request(http_worker, env, svr_conn\ - ,simple_request)) -#define AXIS2_HTTP_WORKER_FREE\ - (http_worker, env) \ +#define AXIS2_HTTP_WORKER_PROCESS_REQUEST(http_worker, env, svr_conn,\ + simple_request) ((http_worker)->ops->process_request(\ + http_worker, env, svr_conn, simple_request)) +#define AXIS2_HTTP_WORKER_FREE(http_worker, env) \ ((http_worker)->ops->free(http_worker, env)) /************************** End of function macros ****************************/ Modified: webservices/axis2/trunk/c/include/axis2_network_handler.h URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_network_handler.h?rev=368627&r1=368626&r2=368627&view=diff ============================================================================== --- webservices/axis2/trunk/c/include/axis2_network_handler.h (original) +++ webservices/axis2/trunk/c/include/axis2_network_handler.h Thu Jan 12 23:50:12 2006 @@ -64,15 +64,22 @@ /** * used to set up socket options such as timeouts, non-blocking ..etc - * @param socket valid socket (obtained by socket() or similar callo + * @param socket valid socket (obtained by socket() or similar call) * @param option the name of the option * @param value Value to be set * @return status of the operations as axis2_status_t */ AXIS2_DECLARE(axis2_status_t) -axis2_network_handler_set_sock_option(axis2_env_t **env, int socket, - int option, int value); - +axis2_network_handler_set_sock_option(axis2_env_t **env, int socket, int option, + int value); +/** + * Accepts remote connections for a server socket + * @param socket valid server socket (obtained by socket() or similar call) + * @return created socket to handle the incoming client connection + */ +AXIS2_DECLARE(int) +axis2_network_handler_svr_socket_accept(axis2_env_t **env, int socket); + /** @} */ #ifdef __cplusplus Modified: webservices/axis2/trunk/c/include/axis2_simple_http_svr_conn.h URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_simple_http_svr_conn.h?rev=368627&r1=368626&r2=368627&view=diff ============================================================================== --- webservices/axis2/trunk/c/include/axis2_simple_http_svr_conn.h (original) +++ webservices/axis2/trunk/c/include/axis2_simple_http_svr_conn.h Thu Jan 12 23:50:12 2006 @@ -119,7 +119,7 @@ #define AXIS2_SIMPLE_HTTP_SVR_CONN_SET_WRITER(svr_conn, env, writer) \ ((svr_conn)->ops->set_writer(svr_conn, env, writer)) #define AXIS2_SIMPLE_HTTP_SVR_CONN_READ_REQUEST(svr_conn, env) \ - ((svr_conn)->ops->is_open(svr_conn, env)) + ((svr_conn)->ops->read_request(svr_conn, env)) #define AXIS2_SIMPLE_HTTP_SVR_CONN_WRITE_RESPONSE(svr_conn, env, response) \ ((svr_conn)->ops->write_response(svr_conn, env, response)) #define AXIS2_SIMPLE_HTTP_SVR_CONN_GET_SND_TIMEOUT(svr_conn, env)\ Modified: webservices/axis2/trunk/c/include/axis2_soap_over_http_sender.h URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_soap_over_http_sender.h?rev=368627&r1=368626&r2=368627&view=diff ============================================================================== --- webservices/axis2/trunk/c/include/axis2_soap_over_http_sender.h (original) +++ webservices/axis2/trunk/c/include/axis2_soap_over_http_sender.h Thu Jan 12 23:50:12 2006 @@ -73,7 +73,8 @@ axis2_status_t AXIS2_CALL axis2_soap_over_http_sender_get_header_info (axis2_soap_over_http_sender_t *sender, - axis2_env_t **env, axis2_msg_ctx_t *msg_ctx); + axis2_env_t **env, axis2_msg_ctx_t *msg_ctx, + axis2_http_simple_response_t *response); axis2_status_t AXIS2_CALL axis2_soap_over_http_sender_process_response