Revert "[3.5] bpo-29406: asyncio SSL contexts leak sockets after call… by 1st1 · Pull Request #2113 · python/cpython

Expand Up @@ -7,7 +7,6 @@
from . import base_events from . import compat from . import futures from . import protocols from . import transports from .log import logger Expand Down Expand Up @@ -412,7 +411,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')
Expand Down Expand Up @@ -443,8 +442,6 @@ def __init__(self, loop, app_protocol, sslcontext, waiter, 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 Expand Down Expand Up @@ -559,15 +556,6 @@ def _start_shutdown(self): 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) Expand Down Expand Up @@ -695,22 +683,12 @@ def _fatal_error(self, exc, message='Fatal error on transport'): }) 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: Expand Down