mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-24 02:35:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fix for Issue 14725 for 3.3 branch.

Browse source
This commit is contained in:
Richard Oudkerk 2012-05-05 19:45:37 +01:00
parent 7a919e9930
commit fdb8dcf675
3 changed files with 34 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Lib/multiprocessing/connection.py
View file

@ -621,16 +621,24 @@ if sys.platform == 'win32':
def accept(self):
self._handle_queue.append(self._new_handle())
handle = self._handle_queue.pop(0)
ov = _winapi.ConnectNamedPipe(handle, overlapped=True)
try:
res = _winapi.WaitForMultipleObjects([ov.event], False, INFINITE)
except:
ov.cancel()
_winapi.CloseHandle(handle)
raise
finally:
_, err = ov.GetOverlappedResult(True)
assert err == 0
ov = _winapi.ConnectNamedPipe(handle, overlapped=True)
except OSError as e:
if e.winerror != _winapi.ERROR_NO_DATA:
raise
# ERROR_NO_DATA can occur if a client has already connected,
# written data and then disconnected -- see Issue 14725.
else:
try:
res = _winapi.WaitForMultipleObjects(
[ov.event], False, INFINITE)
except:
ov.cancel()
_winapi.CloseHandle(handle)
raise
finally:
_, err = ov.GetOverlappedResult(True)
assert err == 0
return PipeConnection(handle)
@staticmethod