Changeset 31189 in vbox for trunk/src/VBox/Runtime

Timestamp:

Jul 29, 2010 7:23:48 AM (14 years ago)

Author:

vboxsync

Message:

Runtime/sockets: Don't switch back to blocking mode if the socket is currently operated in non-blocking mode

File:

• trunk/src/VBox/Runtime/r3/socket.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/r3/socket.cpp

@@ -1361 +1361 @@
             pThis->fSubscribedEvts = 0;
 
-            u_long fNonBlocking = 0;
-            int rc2 = ioctlsocket(pThis->hNative, FIONBIO, &fNonBlocking);
-            if (rc2 != 0)
+            /*
+             * Don't switch back to blocking mode if the socket is currently
+             * operated in non-blocking mode.
+             */
+            if (pThis->fBlocking)
             {
-                rc = rtSocketError();
-                AssertMsgFailed(("%Rrc; rc2=%d\n", rc, rc2));
+                u_long fNonBlocking = 0;
+                int rc2 = ioctlsocket(pThis->hNative, FIONBIO, &fNonBlocking);
+                if (rc2 != 0)
+                {
+                    rc = rtSocketError();
+                    AssertMsgFailed(("%Rrc; rc2=%d\n", rc, rc2));
+                }
             }
         }