summaryrefslogtreecommitdiffstats
path: root/Lib/asyncio/sslproto.py
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2015-09-21 16:08:06 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2015-09-21 16:08:06 (GMT)
commitd1fcca8adada7dcbd08515cde6d68b1ded3997b0 (patch)
tree1487e13be85614688d6e3b8239d4885efc9359e0 /Lib/asyncio/sslproto.py
parent6dae395ed55bba164fe16183decef53ea4ff32fa (diff)
parentf7dc7fb74d7c44a60f36a69437125f5ff70e32e5 (diff)
downloadcpython-d1fcca8adada7dcbd08515cde6d68b1ded3997b0.zip
cpython-d1fcca8adada7dcbd08515cde6d68b1ded3997b0.tar.gz
cpython-d1fcca8adada7dcbd08515cde6d68b1ded3997b0.tar.bz2
Merge 3.4 (asyncio)
Diffstat (limited to 'Lib/asyncio/sslproto.py')
-rw-r--r--Lib/asyncio/sslproto.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/Lib/asyncio/sslproto.py b/Lib/asyncio/sslproto.py
index e5ae49a..0a8c090 100644
--- a/Lib/asyncio/sslproto.py
+++ b/Lib/asyncio/sslproto.py
@@ -295,6 +295,7 @@ class _SSLProtocolTransport(transports._FlowControlMixin,
def __init__(self, loop, ssl_protocol, app_protocol):
self._loop = loop
+ # SSLProtocol instance
self._ssl_protocol = ssl_protocol
self._app_protocol = app_protocol
self._closed = False
@@ -425,10 +426,12 @@ class SSLProtocol(protocols.Protocol):
self._app_protocol = app_protocol
self._app_transport = _SSLProtocolTransport(self._loop,
self, self._app_protocol)
+ # _SSLPipe instance (None until the connection is made)
self._sslpipe = None
self._session_established = False
self._in_handshake = False
self._in_shutdown = False
+ # transport, ex: SelectorSocketTransport
self._transport = None
def _wakeup_waiter(self, exc=None):
@@ -591,6 +594,7 @@ class SSLProtocol(protocols.Protocol):
self._extra.update(peercert=peercert,
cipher=sslobj.cipher(),
compression=sslobj.compression(),
+ ssl_object=sslobj,
)
self._app_protocol.connection_made(self._app_transport)
self._wakeup_waiter()