clar 2005/06/10 13:31:49
Modified: jk/native/common jk_connect.c
Log:
Enabling nb_connect() and setsockopt for apache build with LibC (2.0.x) on
NetWare.
Revision Changes Path
1.61 +4 -4 jakarta-tomcat-connectors/jk/native/common/jk_connect.c
Index: jk_connect.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_connect.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- jk_connect.c 26 May 2005 14:39:37 -0000 1.60
+++ jk_connect.c 10 Jun 2005 20:31:49 -0000 1.61
@@ -109,7 +109,7 @@
return 0;
}
-#if defined (WIN32)
+#if defined (WIN32) || (defined(NETWARE) && defined(__NOVELL_LIBC__))
/* WIN32 implementation */
static int nb_connect(int sock, struct sockaddr *addr, int timeout)
{
@@ -372,7 +372,7 @@
}
if (timeout > 0) {
-#if defined(WIN32)
+#if defined(WIN32) || (defined(NETWARE) && defined(__NOVELL_LIBC__))
int tmout = timeout * 1000;
setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO,
(const char *) &tmout, sizeof(int));
@@ -503,7 +503,7 @@
if (shutdown(s, SHUT_WR)) {
return jk_close_socket(s);
}
-#if defined(WIN32)
+#if defined(WIN32) || (defined(NETWARE) && defined(__NOVELL_LIBC__))
setsockopt(s, SOL_SOCKET, SO_RCVTIMEO,
(const char *) &tmout, sizeof(int));
#elif defined(SO_RCVTIMEO) && defined(USE_SO_RCVTIMEO)
