diff options
author | Victor Stinner <victor.stinner@gmail.com> | 2015-01-26 14:03:20 (GMT) |
---|---|---|
committer | Victor Stinner <victor.stinner@gmail.com> | 2015-01-26 14:03:20 (GMT) |
commit | a19b7b3fcafe52b98245e14466ffc4d6750ca4f1 (patch) | |
tree | 6aff424bf56089154fb15c7bc7637c54ab790f3d /Lib/asyncio/windows_events.py | |
parent | b76bcc4ffc1f81a3cb5e6cabb77f127f71e2eddb (diff) | |
download | cpython-a19b7b3fcafe52b98245e14466ffc4d6750ca4f1.zip cpython-a19b7b3fcafe52b98245e14466ffc4d6750ca4f1.tar.gz cpython-a19b7b3fcafe52b98245e14466ffc4d6750ca4f1.tar.bz2 |
asyncio: Fix ProactorEventLoop.start_serving_pipe()
If a client connected before the server was closed: drop the client (close the
pipe) and exit.
Diffstat (limited to 'Lib/asyncio/windows_events.py')
-rw-r--r-- | Lib/asyncio/windows_events.py | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/Lib/asyncio/windows_events.py b/Lib/asyncio/windows_events.py index 6c7e058..109f5d3 100644 --- a/Lib/asyncio/windows_events.py +++ b/Lib/asyncio/windows_events.py @@ -257,7 +257,7 @@ class PipeServer(object): def _server_pipe_handle(self, first): # Return a wrapper for a new pipe handle. - if self._address is None: + if self.closed(): return None flags = _winapi.PIPE_ACCESS_DUPLEX | _winapi.FILE_FLAG_OVERLAPPED if first: @@ -273,6 +273,9 @@ class PipeServer(object): self._free_instances.add(pipe) return pipe + def closed(self): + return (self._address is None) + def close(self): if self._accept_pipe_future is not None: self._accept_pipe_future.cancel() @@ -325,12 +328,21 @@ class ProactorEventLoop(proactor_events.BaseProactorEventLoop): if f: pipe = f.result() server._free_instances.discard(pipe) + + if server.closed(): + # A client connected before the server was closed: + # drop the client (close the pipe) and exit + pipe.close() + return + protocol = protocol_factory() self._make_duplex_pipe_transport( pipe, protocol, extra={'addr': address}) + pipe = server._get_unconnected_pipe() if pipe is None: return + f = self._proactor.accept_pipe(pipe) except OSError as exc: if pipe and pipe.fileno() != -1: |