You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by sa...@apache.org on 2006/03/08 05:44:38 UTC

svn commit: r384118 - in /webservices/axis2/trunk/c/modules: platforms/unix/axis2_unix.h platforms/windows/axis2_windows.h util/network_handler.c

Author: sahan
Date: Tue Mar  7 20:44:36 2006
New Revision: 384118

URL: http://svn.apache.org/viewcvs?rev=384118&view=rev
Log:
Changing the network handler to compile in windows

Modified:
    webservices/axis2/trunk/c/modules/platforms/unix/axis2_unix.h
    webservices/axis2/trunk/c/modules/platforms/windows/axis2_windows.h
    webservices/axis2/trunk/c/modules/util/network_handler.c

Modified: webservices/axis2/trunk/c/modules/platforms/unix/axis2_unix.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/platforms/unix/axis2_unix.h?rev=384118&r1=384117&r2=384118&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/platforms/unix/axis2_unix.h (original)
+++ webservices/axis2/trunk/c/modules/platforms/unix/axis2_unix.h Tue Mar  7 20:44:36 2006
@@ -221,6 +221,7 @@
 #define AXIS2_CLOSE_SOCKET(sock)            close(sock)
 #define AXIS2_CLOSE_SOCKET_ON_EXIT(sock)    fcntl(sock,F_SETFD, FD_CLOEXEC);
 #define axis2_socket_len_t                  socklen_t
+#define AXIS2_SHUT_WR                       SHUT_WR
 
 /** getopt function */
 #define AXIS2_GETOPT getopt

Modified: webservices/axis2/trunk/c/modules/platforms/windows/axis2_windows.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/platforms/windows/axis2_windows.h?rev=384118&r1=384117&r2=384118&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/platforms/windows/axis2_windows.h (original)
+++ webservices/axis2/trunk/c/modules/platforms/windows/axis2_windows.h Tue Mar  7 20:44:36 2006
@@ -188,6 +188,7 @@
 #define AXIS2_CLOSE_SOCKET(sock)			closesocket(sock)
 #define AXIS2_CLOSE_SOCKET_ON_EXIT(sock)	
 #define axis2_socket_len_t					int
+#define AXIS2_SHUT_WR                       SD_SEND
 
 /**
  * Platform specific environment variable access method

Modified: webservices/axis2/trunk/c/modules/util/network_handler.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/network_handler.c?rev=384118&r1=384117&r2=384118&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/network_handler.c (original)
+++ webservices/axis2/trunk/c/modules/util/network_handler.c Tue Mar  7 20:44:36 2006
@@ -153,14 +153,9 @@
 							AXIS2_FAILURE);
 		return AXIS2_FAILURE;
 	}
-    /*
-	if(0 != AXIS2_CLOSE_SOCKET(socket))
-	{
-		return AXIS2_FAILURE;
-	}*/
-    shutdown(socket, SHUT_WR);
+    shutdown(socket, AXIS2_SHUT_WR);
     i = read(socket, buf, 32);
-    close(socket);
+    AXIS2_CLOSE_SOCKET(socket);
 	return AXIS2_SUCCESS;
 }