summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2015-01-15 13:40:03 +0100
committerVictor Stinner <victor.stinner@gmail.com>2015-01-15 13:40:03 +0100
commit7179b0d65269b1accb1de6455cb0662b38b0448f (patch)
tree4f55edb96928d8c7ac773dfdf6b5b3cc87c9b255
parent427c97554a15694a2c63509b681a6d0e6a56853e (diff)
downloadtrollius-7179b0d65269b1accb1de6455cb0662b38b0448f.tar.gz
Fix _ProactorBasePipeTransport.close()
Set the _read_fut attribute to None after cancelling it. This change should fix a race condition with _ProactorWritePipeTransport._pipe_closed().
-rw-r--r--asyncio/proactor_events.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/asyncio/proactor_events.py b/asyncio/proactor_events.py
index a177d32..6d8641f 100644
--- a/asyncio/proactor_events.py
+++ b/asyncio/proactor_events.py
@@ -72,6 +72,7 @@ class _ProactorBasePipeTransport(transports._FlowControlMixin,
self._loop.call_soon(self._call_connection_lost, None)
if self._read_fut is not None:
self._read_fut.cancel()
+ self._read_fut = None
def _fatal_error(self, exc, message='Fatal error on pipe transport'):
if isinstance(exc, (BrokenPipeError, ConnectionResetError)):
@@ -93,9 +94,10 @@ class _ProactorBasePipeTransport(transports._FlowControlMixin,
self._conn_lost += 1
if self._write_fut:
self._write_fut.cancel()
+ self._write_fut = None
if self._read_fut:
self._read_fut.cancel()
- self._write_fut = self._read_fut = None
+ self._read_fut = None
self._pending_write = 0
self._buffer = None
self._loop.call_soon(self._call_connection_lost, exc)