Changeset 907

Timestamp:

01/09/2006 00:39:24 (5 years ago)

Author:

chris

Message:

Revert to trunk

File:

• box/chris/merge/lib/server/SocketStreamTLS.cpp (modified) (2 diffs)

box/chris/merge/lib/server/SocketStreamTLS.cpp

@@ -138 +138 @@
         }
 
+#ifndef WIN32
         // Make the socket non-blocking so timeouts on Read work
-
-#ifdef WIN32
-        u_long nonblocking = 1;
-        ioctlsocket(socket, FIONBIO, &nonblocking);
-#else // !WIN32
         // This is more portable than using ioctl with FIONBIO
         int statusFlags = 0;
@@ -314 +310 @@
                 case SSL_ERROR_WANT_READ:
                 case SSL_ERROR_WANT_WRITE:
-                        // wait for the required data
+                        // wait for the requried data
                         // Will only get once around this loop, so don't need to calculate timeout values
                         if(WaitWhenRetryRequired(se, Timeout) == false)