mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-05 14:41:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Revert "[3.6] bpo-29406: asyncio SSL contexts leak sockets after calling close with certain servers (GH-409) (#2062)" (#2112)

Browse source 
This reverts commit 6e14fd2a14.
This commit is contained in:
Yury Selivanov 2017-06-11 16:46:45 +02:00 • committed by GitHub
parent 176f2ebdad
commit 83d30bd667
3 changed files with 1 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Lib/asyncio/sslproto.py
View file

@ -7,7 +7,6 @@ except ImportError: # pragma: no cover
from . import base_events
from . import compat
from . import futures
from . import protocols
from . import transports
from .log import logger
@ -413,7 +412,7 @@ class SSLProtocol(protocols.Protocol):
def __init__(self, loop, app_protocol, sslcontext, waiter,
server_side=False, server_hostname=None,
call_connection_made=True, shutdown_timeout=5.0):
call_connection_made=True):
if ssl is None:
raise RuntimeError('stdlib ssl module not available')
@ -444,8 +443,6 @@ class SSLProtocol(protocols.Protocol):
self._session_established = False
self._in_handshake = False
self._in_shutdown = False
self._shutdown_timeout = shutdown_timeout
self._shutdown_timeout_handle = None
# transport, ex: SelectorSocketTransport
self._transport = None
self._call_connection_made = call_connection_made
@ -560,15 +557,6 @@ class SSLProtocol(protocols.Protocol):
self._in_shutdown = True
self._write_appdata(b'')
if self._shutdown_timeout is not None:
self._shutdown_timeout_handle = self._loop.call_later(
self._shutdown_timeout, self._on_shutdown_timeout)
def _on_shutdown_timeout(self):
if self._transport is not None:
self._fatal_error(
futures.TimeoutError(), 'Can not complete shitdown operation')
def _write_appdata(self, data):
self._write_backlog.append((data, 0))
self._write_buffer_size += len(data)
@ -696,22 +684,12 @@ class SSLProtocol(protocols.Protocol):
})
if self._transport:
self._transport._force_close(exc)
self._transport = None
if self._shutdown_timeout_handle is not None:
self._shutdown_timeout_handle.cancel()
self._shutdown_timeout_handle = None
def _finalize(self):
self._sslpipe = None
if self._transport is not None:
self._transport.close()
self._transport = None
if self._shutdown_timeout_handle is not None:
self._shutdown_timeout_handle.cancel()
self._shutdown_timeout_handle = None
def _abort(self):
try: