commit 6c765284a305db7a1afbbd8b05ef39835848e7c1
author Daniel Stutzbach <daniel@stutzbachenterprises.com> Fri Sep 03 12:38:33 2010 +0000
committer Daniel Stutzbach <daniel@stutzbachenterprises.com> Fri Sep 03 12:38:33 2010 +0000
tree 9907b78d5de829908ef5f97930a81cc7f0825d27
parent 06a3c8ae82c76bd0ea21d3860a65bd6ece6ab72e

Fix Issue9753: socket.dup() does not always work right on Windows

Modules/socketmodule.c

diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 8c743d8..6ebb9d9 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -351,16 +351,13 @@
 static SOCKET
 dup_socket(SOCKET handle)
 {
-    HANDLE newhandle;
+    WSAPROTOCOL_INFO info;
 
-    if (!DuplicateHandle(GetCurrentProcess(), (HANDLE)handle,
-                         GetCurrentProcess(), &newhandle,
-                         0, FALSE, DUPLICATE_SAME_ACCESS))
-    {
-        WSASetLastError(GetLastError());
+    if (WSADuplicateSocket(handle, GetCurrentProcessId(), &info))
         return INVALID_SOCKET;
-    }
-    return (SOCKET)newhandle;
+
+    return WSASocket(FROM_PROTOCOL_INFO, FROM_PROTOCOL_INFO,
+                     FROM_PROTOCOL_INFO, &info, 0, 0);
 }
 #define SOCKETCLOSE closesocket
 #else