Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 10063 invoked from network); 17 Jan 2006 09:47:26 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 17 Jan 2006 09:47:26 -0000 Received: (qmail 56943 invoked by uid 500); 17 Jan 2006 09:47:17 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 56916 invoked by uid 500); 17 Jan 2006 09:47:16 -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 56905 invoked by uid 500); 17 Jan 2006 09:47:16 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 56902 invoked by uid 99); 17 Jan 2006 09:47:16 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Jan 2006 01:47:16 -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; Tue, 17 Jan 2006 01:47:15 -0800 Received: (qmail 9755 invoked by uid 65534); 17 Jan 2006 09:46:50 -0000 Message-ID: <20060117094649.9741.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r369734 - in /webservices/axis2/trunk/c/modules: core/deployment/arch_reader.c core/engine/engine.c core/transport/http/http_transport_utils.c core/transport/http/receiver/http_response_writer.c util/file.c util/file_handler.c Date: Tue, 17 Jan 2006 09:45:42 -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: Tue Jan 17 01:45:24 2006 New Revision: 369734 URL: http://svn.apache.org/viewcvs?rev=369734&view=rev Log: More fixes to get the server working Modified: webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c webservices/axis2/trunk/c/modules/core/engine/engine.c webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_response_writer.c webservices/axis2/trunk/c/modules/util/file.c webservices/axis2/trunk/c/modules/util/file_handler.c Modified: webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c?rev=369734&r1=369733&r2=369734&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c (original) +++ webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c Tue Jan 17 01:45:24 2006 @@ -425,7 +425,8 @@ AXIS2_PARAM_CHECK((*env)->error, dep_engine, AXIS2_FAILURE); AXIS2_PARAM_CHECK((*env)->error, module, AXIS2_FAILURE); - file_name = AXIS2_STRACAT(file_path, AXIS2_MODULE_XML, env); + /*file_name = AXIS2_STRACAT(file_path, AXIS2_MODULE_XML, env);*/ + file_name = file_path; if(!file_name) { AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE); Modified: webservices/axis2/trunk/c/modules/core/engine/engine.c URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/engine.c?rev=369734&r1=369733&r2=369734&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/core/engine/engine.c (original) +++ webservices/axis2/trunk/c/modules/core/engine/engine.c Tue Jan 17 01:45:24 2006 @@ -300,6 +300,8 @@ if ( (AXIS2_MSG_CTX_GET_SERVER_SIDE(msg_ctx, env)) && !(AXIS2_MSG_CTX_IS_PAUSED(msg_ctx, env))) { /* invoke the Message Receivers */ + if (!op) + return AXIS2_FAILURE; axis2_msg_recv_t *receiver = AXIS2_OP_GET_MSG_RECEIVER(op, env); AXIS2_MSG_RECV_RECEIVE(receiver, env, msg_ctx); } Modified: webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c?rev=369734&r1=369733&r2=369734&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c (original) +++ webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c Tue Jan 17 01:45:24 2006 @@ -208,8 +208,12 @@ AXIS2_MSG_CTX_SET_SOAP_ENVELOPE(msg_ctx, env, soap_envelope); axis2_engine_t *engine = NULL; engine = axis2_engine_create(env, conf_ctx); - if(AXIS2_TRUE == AXIS2_SOAP_BODY_HAS_FAULT(AXIS2_SOAP_ENVELOPE_GET_BODY( - soap_envelope, env), env)) + axis2_soap_body_t *soap_body = AXIS2_SOAP_ENVELOPE_GET_BODY(soap_envelope, env); + + if (!soap_body) + return AXIS2_FAILURE; + + if(AXIS2_TRUE == AXIS2_SOAP_BODY_HAS_FAULT(soap_body, env)) { AXIS2_ENGINE_RECEIVE_FAULT(engine, env, msg_ctx); } @@ -608,7 +612,7 @@ tmp = AXIS2_STRACAT("Axis2:Services" , tmp2, env); AXIS2_FREE((*env)->allocator, tmp2); - tmp2 = AXIS2_STRACAT(tmp, "", env); + tmp2 = AXIS2_STRACAT(tmp, "\r\n", env); AXIS2_FREE((*env)->allocator, tmp); return tmp2; Modified: webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_response_writer.c URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_response_writer.c?rev=369734&r1=369733&r2=369734&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 Tue Jan 17 01:45:24 2006 @@ -268,6 +268,7 @@ return AXIS2_FAILURE; } write = AXIS2_STREAM_WRITE(writer_impl->stream, env, str, len); + printf ("str = %s...\n len = %d\n", str, len); if(write < 0) { return AXIS2_FAILURE; Modified: webservices/axis2/trunk/c/modules/util/file.c URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/file.c?rev=369734&r1=369733&r2=369734&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/util/file.c (original) +++ webservices/axis2/trunk/c/modules/util/file.c Tue Jan 17 01:45:24 2006 @@ -45,11 +45,11 @@ axis2_file_free (axis2_file_t *file, axis2_env_t **env) { - if(file->name) + /*if(file->name) { AXIS2_FREE((*env)->allocator, file->name); file->name = NULL; - } + }*/ if(file) { Modified: webservices/axis2/trunk/c/modules/util/file_handler.c URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/file_handler.c?rev=369734&r1=369733&r2=369734&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/util/file_handler.c (original) +++ webservices/axis2/trunk/c/modules/util/file_handler.c Tue Jan 17 01:45:24 2006 @@ -61,3 +61,4 @@ } return status; } +