merge from 3.2 - Fix closes Issue12576 - fix urlopen behavior on sites which do not send (or obsfuscates) Connection: Close header.

This commit is contained in:
Senthil Kumaran 2011-07-27 08:06:44 +08:00
commit 7496fef8ff
3 changed files with 25 additions and 3 deletions

View file

@ -1143,11 +1143,14 @@ class AbstractHTTPHandler(BaseHandler):
try:
h.request(req.get_method(), req.selector, req.data, headers)
r = h.getresponse() # an HTTPResponse instance
except socket.error as err:
except socket.error as err: # timeout error
raise URLError(err)
finally:
h.close()
try:
r = h.getresponse() # an HTTPResponse instance
except Exception as exp:
h.close()
raise exp
r.url = req.get_full_url()
# This line replaces the .msg attribute of the HTTPResponse