bpo-31632: fix set_protocol() in _SSLProtocolTransport (#3817) (#3817)

This commit is contained in:
jlacoline 2017-10-19 19:49:57 +02:00 committed by Yury Selivanov
parent ce9e625445
commit ea2ef5d0ca
4 changed files with 15 additions and 6 deletions

View file

@ -293,11 +293,10 @@ class _SSLPipe(object):
class _SSLProtocolTransport(transports._FlowControlMixin,
transports.Transport):
def __init__(self, loop, ssl_protocol, app_protocol):
def __init__(self, loop, ssl_protocol):
self._loop = loop
# SSLProtocol instance
self._ssl_protocol = ssl_protocol
self._app_protocol = app_protocol
self._closed = False
def get_extra_info(self, name, default=None):
@ -305,10 +304,10 @@ class _SSLProtocolTransport(transports._FlowControlMixin,
return self._ssl_protocol._get_extra_info(name, default)
def set_protocol(self, protocol):
self._app_protocol = protocol
self._ssl_protocol._app_protocol = protocol
def get_protocol(self):
return self._app_protocol
return self._ssl_protocol._app_protocol
def is_closing(self):
return self._closed
@ -431,8 +430,7 @@ class SSLProtocol(protocols.Protocol):
self._waiter = waiter
self._loop = loop
self._app_protocol = app_protocol
self._app_transport = _SSLProtocolTransport(self._loop,
self, self._app_protocol)
self._app_transport = _SSLProtocolTransport(self._loop, self)
# _SSLPipe instance (None until the connection is made)
self._sslpipe = None
self._session_established = False