Merged revisions 84450 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r84450 | daniel.stutzbach | 2010-09-03 07:38:33 -0500 (Fri, 03 Sep 2010) | 1 line Fix Issue9753: socket.dup() does not always work right on Windows ........
This commit is contained in:
parent
b82d5e1525
commit
ee541e0d81
|
@ -105,6 +105,9 @@ C-API
|
|||
Library
|
||||
-------
|
||||
|
||||
- Issue #9753: Fixed socket.dup, which did not always work correctly
|
||||
on Windows.
|
||||
|
||||
- Issue #1868: Eliminate subtle timing issues in thread-local objects by
|
||||
getting rid of the cached copy of thread-local attribute dictionary.
|
||||
|
||||
|
|
|
@ -351,16 +351,13 @@ const char *inet_ntop(int af, const void *src, char *dst, socklen_t size);
|
|||
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
|
||||
|
|
Loading…
Reference in New Issue