Merge 3.4 (asyncio)

1 files changed, 6 insertions, 2 deletions

diff --git a/Lib/asyncio/sslproto.py b/Lib/asyncio/sslproto.py
index 541e252..c7fb4e7 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_soon(self._process_write_backlog)
 
     def _process_write_backlog(self):
         # Try to make progress on the write backlog.