diff options
| author | Senthil Kumaran <orsenthil@gmail.com> | 2010-08-19 17:50:31 (GMT) |
|---|---|---|
| committer | Senthil Kumaran <orsenthil@gmail.com> | 2010-08-19 17:50:31 (GMT) |
| commit | 67a62a41b80c3063661ff29611344739dd78aded (patch) | |
| tree | 1a61d40b8650a73ff372ee11ec8a5c321494c86c /Lib/urllib | |
| parent | 92dc80a8d8c4bf72a40079c46d6fb6302e448b0c (diff) | |
| download | cpython-67a62a41b80c3063661ff29611344739dd78aded.zip cpython-67a62a41b80c3063661ff29611344739dd78aded.tar.gz cpython-67a62a41b80c3063661ff29611344739dd78aded.tar.bz2 | |
Fix Issue9639 - reset the retry count on successful auth.
Diffstat (limited to 'Lib/urllib')
| -rw-r--r-- | Lib/urllib/request.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py index 0a083b8..68a8cab 100644 --- a/Lib/urllib/request.py +++ b/Lib/urllib/request.py @@ -778,6 +778,9 @@ class AbstractBasicAuthHandler: self.add_password = self.passwd.add_password self.retried = 0 + def reset_retry_count(self): + self.retried = 0 + def http_error_auth_reqed(self, authreq, host, req, headers): # host may be an authority (without userinfo) or a URL with an # authority @@ -817,8 +820,10 @@ class HTTPBasicAuthHandler(AbstractBasicAuthHandler, BaseHandler): def http_error_401(self, req, fp, code, msg, headers): url = req.full_url - return self.http_error_auth_reqed('www-authenticate', + response = self.http_error_auth_reqed('www-authenticate', url, req, headers) + self.reset_retry_count() + return response class ProxyBasicAuthHandler(AbstractBasicAuthHandler, BaseHandler): @@ -831,8 +836,10 @@ class ProxyBasicAuthHandler(AbstractBasicAuthHandler, BaseHandler): # should not, RFC 3986 s. 3.2.1) support requests for URLs containing # userinfo. authority = req.host - return self.http_error_auth_reqed('proxy-authenticate', + response = self.http_error_auth_reqed('proxy-authenticate', authority, req, headers) + self.reset_retry_count() + return response def randombytes(n): |