[Python-checkins] cpython (merge 3.6 -> default): Merge 3.6 (issue #23749)

Wed Oct 5 19:40:44 EDT 2016

https://hg.python.org/cpython/rev/f2204eaba685
changeset: 104316:f2204eaba685
parent: 104313:8bc3e9754b3d
parent: 104315:3e6739e5c2d0
user: Yury Selivanov <yury at magic.io>
date: Wed Oct 05 19:40:40 2016 -0400
summary:
 Merge 3.6 (issue #23749)
files:
 Lib/asyncio/sslproto.py | 7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Lib/asyncio/sslproto.py b/Lib/asyncio/sslproto.py
--- a/Lib/asyncio/sslproto.py
+++ b/Lib/asyncio/sslproto.py
@@ -411,7 +411,8 @@
 """
 
 def __init__(self, loop, app_protocol, sslcontext, waiter,
- server_side=False, server_hostname=None):
+ server_side=False, server_hostname=None,
+ call_connection_made=True):
 if ssl is None:
 raise RuntimeError('stdlib ssl module not available')
 
@@ -444,6 +445,7 @@
 self._in_shutdown = False
 # transport, ex: SelectorSocketTransport
 self._transport = None
+ self._call_connection_made = call_connection_made
 
 def _wakeup_waiter(self, exc=None):
 if self._waiter is None:
@@ -607,7 +609,8 @@
 compression=sslobj.compression(),
 ssl_object=sslobj,
 )
- self._app_protocol.connection_made(self._app_transport)
+ if self._call_connection_made:
+ self._app_protocol.connection_made(self._app_transport)
 self._wakeup_waiter()
 self._session_established = True
 # In case transport.write() was already called. Don't call
-- 
Repository URL: https://hg.python.org/cpython
