Unverified Kaydet (Commit) be00a558 authored tarafından Victor Stinner's avatar Victor Stinner Kaydeden (comit) GitHub

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

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.
üst 8c1ad0c4
...@@ -592,10 +592,10 @@ class SSLProtocol(protocols.Protocol): ...@@ -592,10 +592,10 @@ class SSLProtocol(protocols.Protocol):
# (b'', 1) is a special value in _process_write_backlog() to do # (b'', 1) is a special value in _process_write_backlog() to do
# the SSL handshake # the SSL handshake
self._write_backlog.append((b'', 1)) self._write_backlog.append((b'', 1))
self._loop.call_soon(self._process_write_backlog)
self._handshake_timeout_handle = \ self._handshake_timeout_handle = \
self._loop.call_later(self._ssl_handshake_timeout, self._loop.call_later(self._ssl_handshake_timeout,
self._check_handshake_timeout) self._check_handshake_timeout)
self._process_write_backlog()
def _check_handshake_timeout(self): def _check_handshake_timeout(self):
if self._in_handshake is True: if self._in_handshake is True:
......
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.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment