bpo-33674: Pause the transport as early as possible (#7192)
diff --git a/Lib/asyncio/base_events.py b/Lib/asyncio/base_events.py
index ffd2513..61938e9 100644
--- a/Lib/asyncio/base_events.py
+++ b/Lib/asyncio/base_events.py
@@ -1106,10 +1106,13 @@
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 0000000..66baca1
--- /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().