mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 17:08:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Issue #19524: Fixed resource leak in the HTTP connection when an invalid

Browse source 
response is received.  Patch by Martin Panter.
This commit is contained in:
Serhiy Storchaka 2014-09-06 21:43:49 +03:00
commit 91453026ff
5 changed files with 86 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Lib/urllib/request.py
View file

@ -1170,18 +1170,21 @@ class AbstractHTTPHandler(BaseHandler):
h.set_tunnel(req._tunnel_host, headers=tunnel_headers)
try:
h.request(req.get_method(), req.selector, req.data, headers)
except OSError as err: # timeout error
h.close()
raise URLError(err)
else:
try:
h.request(req.get_method(), req.selector, req.data, headers)
except OSError as err: # timeout error
raise URLError(err)
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
except:
h.close()
raise
# 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