diff options
| author | Yury Selivanov <yselivanov@sprymix.com> | 2016-05-20 15:31:55 (GMT) |
|---|---|---|
| committer | Yury Selivanov <yselivanov@sprymix.com> | 2016-05-20 15:31:55 (GMT) |
| commit | f4049ee1700936a28494e0da607131bde62a8fe5 (patch) | |
| tree | 7552c5e7d9fcd2271473e68cc5671d5faed50959 | |
| parent | 1b8b42344ed3f6a982b26fcc4255b8490c059527 (diff) | |
| parent | 3dc5129d4fd26d97c1cd8176f6e085db99e38036 (diff) | |
| download | cpython-f4049ee1700936a28494e0da607131bde62a8fe5.zip cpython-f4049ee1700936a28494e0da607131bde62a8fe5.tar.gz cpython-f4049ee1700936a28494e0da607131bde62a8fe5.tar.bz2 | |
Merge 3.5 (asyncio)
| -rw-r--r-- | Lib/asyncio/streams.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Lib/asyncio/streams.py b/Lib/asyncio/streams.py index 0345a3d..6f465af 100644 --- a/Lib/asyncio/streams.py +++ b/Lib/asyncio/streams.py @@ -225,9 +225,11 @@ class StreamReaderProtocol(FlowControlMixin, protocols.Protocol): self._stream_reader = stream_reader self._stream_writer = None self._client_connected_cb = client_connected_cb + self._over_ssl = False def connection_made(self, transport): self._stream_reader.set_transport(transport) + self._over_ssl = transport.get_extra_info('sslcontext') is not None if self._client_connected_cb is not None: self._stream_writer = StreamWriter(transport, self, self._stream_reader, @@ -252,6 +254,11 @@ class StreamReaderProtocol(FlowControlMixin, protocols.Protocol): def eof_received(self): self._stream_reader.feed_eof() + if self._over_ssl: + # Prevent a warning in SSLProtocol.eof_received: + # "returning true from eof_received() + # has no effect when using ssl" + return False return True |