summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2015-01-26 14:32:13 +0100
committerVictor Stinner <victor.stinner@gmail.com>2015-01-26 14:32:13 +0100
commit600a6d02d4342cc0adef631888862ea6b41f310d (patch)
treebe0bc7f759f68bca428a85f43cf4804ca7ac3341
parent0749f804c58dcd0a629fd8f281ba4d27a654f8d4 (diff)
downloadtrollius-600a6d02d4342cc0adef631888862ea6b41f310d.tar.gz
Fix ProactorEventLoop.start_serving_pipe()
If a client connected before the server was closed: drop the client (close the pipe) and exit
-rw-r--r--asyncio/windows_events.py14
1 files changed, 13 insertions, 1 deletions
diff --git a/asyncio/windows_events.py b/asyncio/windows_events.py
index 6c7e058..109f5d3 100644
--- a/asyncio/windows_events.py
+++ b/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: