From 2b30a1ae96fbf0209c4ddce8d91437a32ed76e54 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Thu, 15 Jan 2015 09:40:16 +0100 Subject: 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. --- asyncio/sslproto.py | 8 ++++++-- 1 file 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. -- cgit v1.2.1