ws-axis-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sa...@apache.org
Subject svn commit: r384719 - in /webservices/axis2/trunk/c: INSTALL include/axis2_error.h modules/core/transport/http/sender/http_client.c modules/util/error.c
Date Fri, 10 Mar 2006 06:55:34 GMT
Author: sahan
Date: Thu Mar  9 22:55:33 2006
New Revision: 384719

URL: http://svn.apache.org/viewcvs?rev=384719&view=rev
Log:
Fixing issue AXIS2C-95

Modified:
    webservices/axis2/trunk/c/INSTALL
    webservices/axis2/trunk/c/include/axis2_error.h
    webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c
    webservices/axis2/trunk/c/modules/util/error.c

Modified: webservices/axis2/trunk/c/INSTALL
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/INSTALL?rev=384719&r1=384718&r2=384719&view=diff
==============================================================================
--- webservices/axis2/trunk/c/INSTALL (original)
+++ webservices/axis2/trunk/c/INSTALL Thu Mar  9 22:55:33 2006
@@ -243,7 +243,8 @@
 
 Note: To do the following tasks you might need super user privileges in your machine.
 
-* Copy the mod_axis2.so to "<apache2 modules directory>" (eg: /usr/lib/apache2/modules)
+* Copy the libmod_axis2.so.0.0.0 to "<apache2 modules directory>" (eg: /usr/lib/apache2/modules)
as mod_axis2.so 
+    eg: cp $AXIS2C_HOME/lib/libmod_axis2.so.0.0.0 /usr/lib/apache2/modules/mod_axis2.so
 * Edit the Apache2's configuration file (generally httpd.conf) and add the following directives
 
     LoadModule axis2_module   <apache2 modules directory>/mod_axis2.so

Modified: webservices/axis2/trunk/c/include/axis2_error.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_error.h?rev=384719&r1=384718&r2=384719&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_error.h (original)
+++ webservices/axis2/trunk/c/include/axis2_error.h Thu Mar  9 22:55:33 2006
@@ -347,6 +347,8 @@
         AXIS2_ERROR_SERVICE_XML_NOT_FOUND,
         /** Module xml file is not found in the given path */
         AXIS2_ERROR_MODULE_XML_NOT_FOUND_FOR_THE_MODULE,
+        /** Content-Type header missing in HTTP response */
+        AXIS2_ERROR_RESPONSE_CONTENT_TYPE_MISSING,
         
         AXIS2_ERROR_OPERATION_NAME_MISSING,
         

Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c?rev=384719&r1=384718&r2=384719&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c Thu Mar  9
22:55:33 2006
@@ -418,12 +418,22 @@
 	}
 	AXIS2_HTTP_SIMPLE_RESPONSE_SET_BODY_STREAM(client_impl->response, env, 
 						client_impl->data_stream); 
-	if(NULL != status_line)
-	{
-		status_code = AXIS2_HTTP_STATUS_LINE_GET_STATUS_CODE(status_line, env);
-		AXIS2_HTTP_STATUS_LINE_FREE(status_line, env);
-		status_line = NULL;
-	}
+    if(NULL != status_line)
+    {
+        status_code = AXIS2_HTTP_STATUS_LINE_GET_STATUS_CODE(status_line, env);
+        AXIS2_HTTP_STATUS_LINE_FREE(status_line, env);
+        status_line = NULL;
+    }
+    if(AXIS2_FALSE == AXIS2_HTTP_SIMPLE_RESPONSE_CONTAINS_HEADER(
+                        client_impl->response, env,
+                        AXIS2_HTTP_HEADER_CONTENT_TYPE) && 202 != status_code)
+    {
+        AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_RESPONSE_CONTENT_TYPE_MISSING
+                , AXIS2_FAILURE);
+        AXIS2_LOG_ERROR((*env)->log, AXIS2_LOG_SI, "Response does not contain"
+                        " Content-Type");
+        return -1;
+    }
     return status_code;
 }
 

Modified: webservices/axis2/trunk/c/modules/util/error.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/error.c?rev=384719&r1=384718&r2=384719&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/error.c (original)
+++ webservices/axis2/trunk/c/modules/util/error.c Thu Mar  9 22:55:33 2006
@@ -411,6 +411,8 @@
         "Flow type of PhaseOrder element cannot be null";
     axis2_error_messages[AXIS2_ERROR_DATA_ELEMENT_IS_NULL] =
         "Data element of the OM Node is null";
+    axis2_error_messages[AXIS2_ERROR_RESPONSE_CONTENT_TYPE_MISSING] =
+    "Content-Type header missing in HTTP response";
 
     return AXIS2_SUCCESS;
 }



Mime
View raw message