diff options
| -rw-r--r-- | Lib/test/test_urllib2.py | 1 | ||||
| -rw-r--r-- | Lib/urllib/request.py | 6 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
3 files changed, 10 insertions, 0 deletions
diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py index 33f90f4..d4c8945 100644 --- a/Lib/test/test_urllib2.py +++ b/Lib/test/test_urllib2.py @@ -283,6 +283,7 @@ class MockHTTPClass: self.req_headers = [] self.data = None self.raise_on_endheaders = False + self.sock = None self._tunnel_headers = {} def __call__(self, host, timeout=socket._GLOBAL_DEFAULT_TIMEOUT): diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py index a7445d1..ef62acc 100644 --- a/Lib/urllib/request.py +++ b/Lib/urllib/request.py @@ -1251,6 +1251,12 @@ class AbstractHTTPHandler(BaseHandler): raise URLError(err) else: r = h.getresponse() + # If the server does not send us a 'Connection: close' header, + # HTTPConnection assumes the socket should be left open. Manually + # mark the socket to be closed when this response object goes away. + if h.sock: + h.sock.close() + h.sock = None r.url = req.get_full_url() # This line replaces the .msg attribute of the HTTPResponse @@ -29,6 +29,9 @@ Core and Builtins Library ------- +- Issue #12692: Backport the fix for ResourceWarning in test_urllib2net. This + also helps in closing the socket when Connection Close header is not sent. + - Issue #19422: Explicitly disallow non-SOCK_STREAM sockets in the ssl module, rather than silently let them emit clear text data. |