mirror of
https://github.com/python/cpython.git
synced 2025-08-04 00:48:58 +00:00
Fix for issue5102, timeout value propages between redirects, proxy, digest and
auth handlers. Fixed tests to reflect the same.
This commit is contained in:
parent
10fc39563c
commit
e9da06f574
2 changed files with 10 additions and 6 deletions
|
@ -552,7 +552,7 @@ class HTTPRedirectHandler(BaseHandler):
|
|||
fp.read()
|
||||
fp.close()
|
||||
|
||||
return self.parent.open(new)
|
||||
return self.parent.open(new, timeout=req.timeout)
|
||||
|
||||
http_error_301 = http_error_303 = http_error_307 = http_error_302
|
||||
|
||||
|
@ -669,7 +669,7 @@ class ProxyHandler(BaseHandler):
|
|||
# {'http': 'ftp://proxy.example.com'}, we may end up turning
|
||||
# a request for http://acme.example.com/a into one for
|
||||
# ftp://proxy.example.com/a
|
||||
return self.parent.open(req)
|
||||
return self.parent.open(req, timeout=req.timeout)
|
||||
|
||||
class HTTPPasswordMgr:
|
||||
|
||||
|
@ -785,7 +785,7 @@ class AbstractBasicAuthHandler:
|
|||
if req.headers.get(self.auth_header, None) == auth:
|
||||
return None
|
||||
req.add_header(self.auth_header, auth)
|
||||
return self.parent.open(req)
|
||||
return self.parent.open(req, timeout=req.timeout)
|
||||
else:
|
||||
return None
|
||||
|
||||
|
@ -866,7 +866,7 @@ class AbstractDigestAuthHandler:
|
|||
if req.headers.get(self.auth_header, None) == auth_val:
|
||||
return None
|
||||
req.add_unredirected_header(self.auth_header, auth_val)
|
||||
resp = self.parent.open(req)
|
||||
resp = self.parent.open(req, timeout=req.timeout)
|
||||
return resp
|
||||
|
||||
def get_cnonce(self, nonce):
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue