ws-axis-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sam...@apache.org
Subject svn commit: r370026 - in /webservices/axis2/trunk/c/modules: core/transport/http/http_worker.c util/stream.c xml/soap/soap_body.c
Date Wed, 18 Jan 2006 03:07:59 GMT
Author: samisa
Date: Tue Jan 17 19:07:51 2006
New Revision: 370026

URL: http://svn.apache.org/viewcvs?rev=370026&view=rev
Log:
More fixes to get the stuff working. Fixed mainly the pointer problems. Also changed fread
to read

Modified:
    webservices/axis2/trunk/c/modules/core/transport/http/http_worker.c
    webservices/axis2/trunk/c/modules/util/stream.c
    webservices/axis2/trunk/c/modules/xml/soap/soap_body.c

Modified: webservices/axis2/trunk/c/modules/core/transport/http/http_worker.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/http_worker.c?rev=370026&r1=370025&r2=370026&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 Tue Jan 17 19:07:51
2006
@@ -371,7 +371,8 @@
         }
         else
         {
-            if(AXIS2_STRCASECMP(AXIS2_HTTP_SIMPLE_RESPONSE_GET_HTTP_VERSION(
+            if(AXIS2_HTTP_SIMPLE_RESPONSE_GET_HTTP_VERSION(simple_response, env) &&
+                    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, 

Modified: webservices/axis2/trunk/c/modules/util/stream.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/stream.c?rev=370026&r1=370025&r2=370026&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/stream.c (original)
+++ webservices/axis2/trunk/c/modules/util/stream.c Tue Jan 17 19:07:51 2006
@@ -593,7 +593,8 @@
 	{
         return -1;
 	}
-	return fread(buffer, sizeof(axis2_char_t), count, fp);	
+	/*return fread(buffer, sizeof(axis2_char_t), count, fp);	*/
+    return read(AXIS2_INTF_TO_IMPL(stream)->socket, buffer, count);
 }
 
 int AXIS2_CALL

Modified: webservices/axis2/trunk/c/modules/xml/soap/soap_body.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/soap/soap_body.c?rev=370026&r1=370025&r2=370026&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/soap/soap_body.c (original)
+++ webservices/axis2/trunk/c/modules/xml/soap/soap_body.c Tue Jan 17 19:07:51 2006
@@ -226,11 +226,12 @@
             fault_ele = AXIS2_OM_ELEMENT_GET_FIRST_ELEMENT( soap_body_ele, env, body_impl->om_ele_node,
&fault_node);
             localname = AXIS2_OM_ELEMENT_GET_LOCALNAME(fault_ele, env);
             om_ns = AXIS2_OM_ELEMENT_GET_NAMESPACE(fault_ele, env);
-            namespace_uri = AXIS2_OM_NAMESPACE_GET_URI(om_ns, env);
+            if (om_ns)
+                namespace_uri = AXIS2_OM_NAMESPACE_GET_URI(om_ns, env);
             
-            if(fault_ele && AXIS2_STRCMP(AXIS2_SOAP_FAULT_LOCAL_NAME, localname)
== 0 &&
-            (AXIS2_STRCMP(AXIS2_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI, namespace_uri) == 0 ||
  
-             AXIS2_STRCMP(AXIS2_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI, namespace_uri) == 0))
+            if(localname && namespace_uri && fault_ele && AXIS2_STRCMP(AXIS2_SOAP_FAULT_LOCAL_NAME,
localname) == 0 &&
+                   (AXIS2_STRCMP(AXIS2_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI, namespace_uri)
== 0 ||   
+                     AXIS2_STRCMP(AXIS2_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI, namespace_uri)
== 0))
              {
                 body_impl->has_fault = AXIS2_TRUE;
                 return body_impl->has_fault;



Mime
View raw message