bpo-33674: asyncio: Fix SSLProtocol race (GH-7175) (#7187)

miss-islington · vstinner · ned-deily · commit 0dd8fd03584b · 2018-05-28T21:44:16.000-04:00
Fix a race condition in SSLProtocol.connection_made() of asyncio.sslproto: start immediately the handshake instead of using call_soon(). Previously, data_received() could be called before the handshake started, causing the handshake to hang or fail. (cherry picked from commit be00a55) Co-authored-by: Victor Stinner <vstinner@redhat.com>
diff --git a/Lib/asyncio/sslproto.py b/Lib/asyncio/sslproto.py
@@ -592,10 +592,10 @@ def _start_handshake(self):
         # (b'', 1) is a special value in _process_write_backlog() to do
         # the SSL handshake
         self._write_backlog.append((b'', 1))
-        self._loop.call_soon(self._process_write_backlog)
         self._handshake_timeout_handle = \
             self._loop.call_later(self._ssl_handshake_timeout,
                                   self._check_handshake_timeout)
+        self._process_write_backlog()
 
     def _check_handshake_timeout(self):
         if self._in_handshake is True:
diff --git a/Misc/NEWS.d/next/Library/2018-05-28-22-49-59.bpo-33674.6LFFj7.rst b/Misc/NEWS.d/next/Library/2018-05-28-22-49-59.bpo-33674.6LFFj7.rst
@@ -0,0 +1,4 @@
+Fix a race condition in SSLProtocol.connection_made() of asyncio.sslproto:
+start immediately the handshake instead of using call_soon(). Previously,
+data_received() could be called before the handshake started, causing the
+handshake to hang or fail.
