Commit fe47e667 authored by Victor Stinner's avatar Victor Stinner

Merge 3.4 (asyncio)

parents 516aaa11 72bdefb0
...@@ -572,8 +572,12 @@ class SSLProtocol(protocols.Protocol): ...@@ -572,8 +572,12 @@ class SSLProtocol(protocols.Protocol):
# wait until protocol.connection_made() has been called # wait until protocol.connection_made() has been called
self._waiter._set_result_unless_cancelled(None) self._waiter._set_result_unless_cancelled(None)
self._session_established = True self._session_established = True
# In case transport.write() was already called # In case transport.write() was already called. Don't call
self._process_write_backlog() # immediatly _process_write_backlog(), but schedule it:
# _on_handshake_complete() can be called indirectly from
# _process_write_backlog(), and _process_write_backlog() is not
# reentrant.
self._loop.call_soon(self._process_write_backlog)
def _process_write_backlog(self): def _process_write_backlog(self):
# Try to make progress on the write backlog. # Try to make progress on the write backlog.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment