mturk 2005/03/17 11:49:23
Modified: jk/native/common jk_connect.c
Log:
WIN32 - do not change exiting var, because it is later used by nb_connect.
Revision Changes Path
1.49 +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.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- jk_connect.c 17 Mar 2005 19:41:58 -0000 1.48
+++ jk_connect.c 17 Mar 2005 19:49:23 -0000 1.49
@@ -362,11 +362,11 @@
if (timeout > 0) {
#if defined(WIN32)
- timeout = timeout * 1000;
+ int tmout = timeout * 1000;
setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO,
- (const char *) &timeout, sizeof(int));
+ (const char *) &tmout, sizeof(int));
setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO,
- (const char *) &timeout, sizeof(int));
+ (const char *) &tmout, sizeof(int));
#elif defined(SO_RCVTIMEO) && defined(USE_SO_RCVTIMEO) &&
defined(SO_SNDTIMEO) && defined(USE_SO_SNDTIMEO)
struct timeval tv;
tv.tv_sec = timeout;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
