axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nand...@apache.org
Subject svn commit: r499673 - in /webservices/axis2/trunk/c/modules/core/transport/http/server/IIS: axis2_iis_worker.c axis2_isapi_plugin.c iis_iaspi_plugin_51/axis2_isapi_51.c
Date Thu, 25 Jan 2007 05:43:10 GMT
Author: nandika
Date: Wed Jan 24 21:43:08 2007
New Revision: 499673

URL: http://svn.apache.org/viewvc?view=rev&rev=499673
Log:
patch applied, thanks to supun

Modified:
    webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_worker.c
    webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_isapi_plugin.c
    webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/iis_iaspi_plugin_51/axis2_isapi_51.c

Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_worker.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_worker.c?view=diff&rev=499673&r1=499672&r2=499673
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_worker.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_worker.c Wed
Jan 24 21:43:08 2007
@@ -249,14 +249,20 @@
 	msg_ctx = axis2_msg_ctx_create(env, conf_ctx, in_desc, out_desc);
     AXIS2_MSG_CTX_SET_SERVER_SIDE(msg_ctx, env, AXIS2_TRUE);
 
-    axis2_msg_ctx_set_transport_out_stream(msg_ctx, env, out_stream);
+    property = axis2_property_create(env);
+    AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
+    AXIS2_PROPERTY_SET_FREE_FUNC(property, env, axis2_stream_free_void_arg);
+    AXIS2_PROPERTY_SET_VALUE(property, env, out_stream);
+    AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, AXIS2_TRANSPORT_OUT, property,
+            AXIS2_FALSE);
+	//axis2_msg_ctx_set_transport_out_stream(msg_ctx, env, out_stream);
 
 	ctx_uuid = axis2_uuid_gen(env);
     AXIS2_MSG_CTX_SET_SVC_GRP_CTX_ID(msg_ctx, env, ctx_uuid);
     AXIS2_FREE(env->allocator, ctx_uuid);
 
     property = axis2_property_create(env);	
-    AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
+    AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_APPLICATION);
     AXIS2_PROPERTY_SET_FREE_FUNC(property, env,
             axis2_iis_out_transport_info_free_void_arg);
     iis_out_transport_info = axis2_iis_out_transport_info_create(env, lpECB);
@@ -367,17 +373,29 @@
 		sprintf(headers_vhtml[1], "%d", strlen(body_string));
 		if(!start_response(lpECB, send_status, NULL, headers_names, headers_vhtml, 2))
 		{
-			
+			AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Error occured in"
+                " writing response.");			
 		}
 
 		cbSize = strlen(body_string);
 		if(!write_response(lpECB, body_string, cbSize))
 		{
-
+			AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Error occured in"
+                " writing response.");
 		}
         AXIS2_FREE(env->allocator, body_string);
         body_string = NULL;
-    }
+    } 
+	else 
+	{		
+		if(!start_response(lpECB, send_status, NULL, NULL, NULL, 0))
+		{
+			AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Error occured in"
+                " writing response.");			
+		}
+	}
+		
+
     if (url)
     {
         AXIS2_URL_FREE(url, env);
@@ -547,7 +565,7 @@
 		ret_url[i] = url[i];
 
 	for (i = 7; url[i] != '\0'; i++)
-		ret_url[i] = url[i + 12];
+		ret_url[i] = url[i + 17];
 
 	ret_url[i] = '\0';
 		

Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_isapi_plugin.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_isapi_plugin.c?view=diff&rev=499673&r1=499672&r2=499673
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_isapi_plugin.c
(original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_isapi_plugin.c
Wed Jan 24 21:43:08 2007
@@ -148,11 +148,11 @@
 
 axis2_status_t axis2_terminate()
 {
-	axiom_xml_reader_cleanup();
+//	axiom_xml_reader_cleanup();
 
-	AXIS2_IIS_WORKER_FREE(axis2_worker, axis2_env);
+//	AXIS2_IIS_WORKER_FREE(axis2_worker, axis2_env);
 
-	axis2_env_free(axis2_env);
+//	axis2_env_free(axis2_env);
 	return TRUE;
 }
 
@@ -161,28 +161,27 @@
 {
 	unsigned int i = 0;	
 	// Should contain "/axis2/"
-	ret_url[0] = '\0';
-	if (!url || strlen(url) < 5){
-		return FALSE;
-	}
-	// Before searching make it to lower case
-	while (url[i] != '\0'){
-		if(url[i] >= 'A' && url[i] <= 'Z')
-			url[i] = url[i] + 'a' - 'A';
-		i++;
-	}	
+	ret_url[0] = '\0';	
 	
 	// The url should begin with "/axis2/"
-	if (url[0] == '/' && url[1] == 'a' && url[2] == 'x' && url[3] ==
'i' 
-					&& url[4] == 's' && url[5] == '2' && url[6] == '/' ){		
+	if (url[0] == '/' && (url[1] == 'a' || url[1] == 'A') 
+					&& (url[2] == 'x' || url[2] == 'X') 
+					&& (url[3] == 'i' || url[3] == 'I') 
+					&& (url[4] == 's' || url[4] == 'S') 
+					&& url[5] == '2' && url[6] == '/' )
+	{		
 
 		// Append the string to redirect the request
 		strcpy(ret_url, redirect_word);
 		strcat(ret_url, &url[7]);
 		return TRUE;
 	}
-	if (url[0] == '/' && url[1] == 'a' && url[2] == 'x' && url[3] ==
'i' 
-					&& url[4] == 's' && url[5] == '2' && url[6] == '\0'){
+	if (url[0] == '/' && (url[1] == 'a' || url[1] == 'A') 
+					&& (url[2] == 'x' || url[2] == 'X') 
+					&& (url[3] == 'i' || url[3] == 'I') 
+					&& (url[4] == 's' || url[4] == 'S') 
+					&& url[5] == '2' && url[6] == '\0')
+	{
 		strcpy(ret_url, redirect_word);
 		return TRUE;
 	}	

Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/iis_iaspi_plugin_51/axis2_isapi_51.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/iis_iaspi_plugin_51/axis2_isapi_51.c?view=diff&rev=499673&r1=499672&r2=499673
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/iis_iaspi_plugin_51/axis2_isapi_51.c
(original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/iis_iaspi_plugin_51/axis2_isapi_51.c
Wed Jan 24 21:43:08 2007
@@ -94,8 +94,9 @@
 
 			//GetHeader(pfc, "URL", url, &bufferLength);
 			pfc->GetServerVariable(pfc, "HTTP_URL", url, &bufferLength);			
-			retVal = get_extension_url(url, modified_url);
-			SetHeader(pfc, "URL", modified_url);
+			if(get_extension_url(url, modified_url)){
+				SetHeader(pfc, "URL", modified_url);
+			}
 			//return SF_STATUS_REQ_HANDLED_NOTIFICATION;
 			break;
 		case SF_NOTIFY_LOG:



---------------------------------------------------------------------
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