diff options
author | Victor Stinner <victor.stinner@gmail.com> | 2015-01-15 09:40:16 +0100 |
---|---|---|
committer | Victor Stinner <victor.stinner@gmail.com> | 2015-01-15 09:40:16 +0100 |
commit | 1da6e1d82c7a466d7d14b928b0f2b1fa568f6417 (patch) | |
tree | a6df071cc630f08251d1f601043ab5e3f0f5cacb | |
parent | 47152d63f3ffa9182afb80456d552012a02bc38c (diff) | |
download | trollius-git-1da6e1d82c7a466d7d14b928b0f2b1fa568f6417.tar.gz |
Python issue #22560: Fix SSLProtocol._on_handshake_complete()
Don't call immediatly self._process_write_backlog() but schedule the call using
call_soon(). _on_handshake_complete() can be called indirectly from
_process_write_backlog(), and _process_write_backlog() is not reentrant.
-rw-r--r-- | asyncio/sslproto.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/asyncio/sslproto.py b/asyncio/sslproto.py index 541e252..c7fb4e7 100644 --- a/asyncio/sslproto.py +++ b/asyncio/sslproto.py @@ -572,8 +572,12 @@ class SSLProtocol(protocols.Protocol): # wait until protocol.connection_made() has been called self._waiter._set_result_unless_cancelled(None) self._session_established = True - # In case transport.write() was already called - self._process_write_backlog() + # In case transport.write() was already called. Don't call + # 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): # Try to make progress on the write backlog. |