axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sam...@apache.org
Subject svn commit: r572527 - in /webservices/axis2/trunk/c/src/core/transport/http/server/apache2: apache2_worker.c mod_axis2.c
Date Tue, 04 Sep 2007 05:18:14 GMT
Author: samisa
Date: Mon Sep  3 22:18:13 2007
New Revision: 572527

URL: http://svn.apache.org/viewvc?rev=572527&view=rev
Log:
Fixed the error in case of SOAP faults, where the deault 500 doc was returned in place of
the SOAP fault
     AXIS2C-676

Modified:
    webservices/axis2/trunk/c/src/core/transport/http/server/apache2/apache2_worker.c
    webservices/axis2/trunk/c/src/core/transport/http/server/apache2/mod_axis2.c

Modified: webservices/axis2/trunk/c/src/core/transport/http/server/apache2/apache2_worker.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/http/server/apache2/apache2_worker.c?rev=572527&r1=572526&r2=572527&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/http/server/apache2/apache2_worker.c (original)
+++ webservices/axis2/trunk/c/src/core/transport/http/server/apache2/apache2_worker.c Mon
Sep  3 22:18:13 2007
@@ -231,7 +231,10 @@
             axis2_engine_t *engine = axis2_engine_create(env, conf_ctx);
             if (! engine)
             {
-                send_status =  HTTP_INTERNAL_SERVER_ERROR;
+                /* Critical error, cannot proceed, Apache will send default 
+                   document for 500
+                */
+                return AXIS2_CRITICAL_FAILURE;
             }
             if ( axis2_msg_ctx_get_is_soap_11 (msg_ctx, env))
             {
@@ -251,7 +254,12 @@
                 body_string = axutil_stream_get_buffer(out_stream, env);
                 body_string_len = axutil_stream_get_len(out_stream, env);
             }
-            send_status =  HTTP_INTERNAL_SERVER_ERROR;
+            
+            /* In case of a SOAP Fault, we have to set the status to 500,
+               but still return OK because the module has handled the error 
+            */
+            send_status =  OK;
+            request->status = HTTP_INTERNAL_SERVER_ERROR;
         }
     }
     

Modified: webservices/axis2/trunk/c/src/core/transport/http/server/apache2/mod_axis2.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/http/server/apache2/mod_axis2.c?rev=572527&r1=572526&r2=572527&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/http/server/apache2/mod_axis2.c (original)
+++ webservices/axis2/trunk/c/src/core/transport/http/server/apache2/mod_axis2.c Mon Sep 
3 22:18:13 2007
@@ -238,6 +238,7 @@
     {
         return HTTP_INTERNAL_SERVER_ERROR;
     }
+    
     return rv;
 }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message