mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 10:19:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge 3.5 (issue #23749)

Browse source
This commit is contained in:
Yury Selivanov 2016-10-05 19:40:19 -04:00
commit a88614233e
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Lib/asyncio/sslproto.py
View file

@ -411,7 +411,8 @@ class SSLProtocol(protocols.Protocol):
""" """
def __init__(self, loop, app_protocol, sslcontext, waiter, 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: if ssl is None:
raise RuntimeError('stdlib ssl module not available') raise RuntimeError('stdlib ssl module not available')
@ -444,6 +445,7 @@ class SSLProtocol(protocols.Protocol):
self._in_shutdown = False self._in_shutdown = False
# transport, ex: SelectorSocketTransport # transport, ex: SelectorSocketTransport
self._transport = None self._transport = None
self._call_connection_made = call_connection_made
def _wakeup_waiter(self, exc=None): def _wakeup_waiter(self, exc=None):
if self._waiter is None: if self._waiter is None:
@ -607,7 +609,8 @@ class SSLProtocol(protocols.Protocol):
compression=sslobj.compression(), compression=sslobj.compression(),
ssl_object=sslobj, 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._wakeup_waiter()
self._session_established = True self._session_established = True
# In case transport.write() was already called. Don't call # In case transport.write() was already called. Don't call