Changeset 3056

Timestamp:

2002-03-07T20:17:08+13:00 (22 years ago)

Author:

sjboddie

Message:

Commented out recent change to make socket read non-blocking. This
change didn't appear to have the desired effect (certainly on Windows 98
the problems remained) and relied on wsock32.lib being linked at compile
time. Including wsock32 might be ok but it needs some testing to be sure.
That is, how will it react with restricted (billsock) version, particularly
on machines that don't have networking installed? For now it seems safer
to live with the bug we know.

Location:

trunk/gsdl/src/w32server

Files:

• httpreq.cpp (modified) (1 diff)
• win32.mak (modified) (1 diff)

trunk/gsdl/src/w32server/httpreq.cpp

@@ -425 +425 @@
       // slurp it all up here.
       char *tmpbuffer = new char(100);
-      unsigned long int nonblockmode=1;
-      ioctlsocket(RequestInfo.ClientSocket, FIONBIO, &nonblockmode);
+      //      unsigned long int nonblockmode=1;
+      //      ioctlsocket(RequestInfo.ClientSocket, FIONBIO, &nonblockmode);
       d_recv(RequestInfo.ClientSocket, tmpbuffer, 100, 0);
       delete tmpbuffer;

trunk/gsdl/src/w32server/win32.mak

@@ -57 +57 @@
 WINLIBS = kernel32.lib user32.lib gdi32.lib winspool.lib \
           comdlg32.lib advapi32.lib shell32.lib ole32.lib \
-          oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib
+          oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 
+#wsock32.lib
 
 COMPILE = $(CC) -c $(CPPFLAGS) $(DEFS) $(INCLUDES)