From eca085993cb8620ba9232560f46d91326a13cdd2 Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Mon, 28 May 2018 22:59:03 -0700 Subject: [PATCH] bpo-33674: Pause the transport as early as possible (GH-7192) (cherry picked from commit f295587c45f96b62d24f9a12cef6931b0805f596) Co-authored-by: Yury Selivanov --- Lib/asyncio/base_events.py | 7 +++++-- .../next/Library/2018-05-29-00-37-56.bpo-33674.2IkGhL.rst | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 Misc/NEWS.d/next/Library/2018-05-29-00-37-56.bpo-33674.2IkGhL.rst diff --git a/Lib/asyncio/base_events.py b/Lib/asyncio/base_events.py index ffd2513e33..61938e90c3 100644 --- a/Lib/asyncio/base_events.py +++ b/Lib/asyncio/base_events.py @@ -1106,10 +1106,13 @@ class BaseEventLoop(events.AbstractEventLoop): ssl_handshake_timeout=ssl_handshake_timeout, call_connection_made=False) + # Pause early so that "ssl_protocol.data_received()" doesn't + # have a chance to get called before "ssl_protocol.connection_made()". + transport.pause_reading() + transport.set_protocol(ssl_protocol) self.call_soon(ssl_protocol.connection_made, transport) - if not transport.is_reading(): - self.call_soon(transport.resume_reading) + self.call_soon(transport.resume_reading) await waiter return ssl_protocol._app_transport diff --git a/Misc/NEWS.d/next/Library/2018-05-29-00-37-56.bpo-33674.2IkGhL.rst b/Misc/NEWS.d/next/Library/2018-05-29-00-37-56.bpo-33674.2IkGhL.rst new file mode 100644 index 0000000000..66baca16d6 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2018-05-29-00-37-56.bpo-33674.2IkGhL.rst @@ -0,0 +1,2 @@ +Pause the transport as early as possible to further reduce the risk of +data_received() being called before connection_made(). -- 2.50.1