From: Victor Stinner Date: Thu, 15 Jan 2015 08:41:48 +0000 (+0100) Subject: Issue #22560: Fix SSLProtocol._on_handshake_complete() X-Git-Tag: v3.4.3rc1~133 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=042dad7232a021e6c848f1368e75d8b3e5ce0dbe;p=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. --- diff --git a/Lib/asyncio/sslproto.py b/Lib/asyncio/sslproto.py index 541e252774..31eab51ca1 100644 --- a/Lib/asyncio/sslproto.py +++ b/Lib/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(self._process_write_backlog) def _process_write_backlog(self): # Try to make progress on the write backlog.