changeset:   104315:3e6739e5c2d0
branch:      3.6
parent:      104312:f7550d535878
parent:      104314:3771a6326725
user:        Yury Selivanov <yury@magic.io>
date:        Wed Oct 05 19:40:19 2016 -0400
files:       Lib/asyncio/sslproto.py
description:
Merge 3.5 (issue #23749)


diff -r f7550d535878 -r 3e6739e5c2d0 Lib/asyncio/sslproto.py
--- a/Lib/asyncio/sslproto.py	Wed Oct 05 19:33:36 2016 -0400
+++ b/Lib/asyncio/sslproto.py	Wed Oct 05 19:40:19 2016 -0400
@@ -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