traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix - Issue9639: Reset the retry counter after successful authentication.

This commit is contained in:
Senthil Kumaran 2010-08-19 17:32:03 +00:00
parent 6086b0dd95
commit 4f1ba0de8a
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Lib/urllib2.py
View File

@ -822,6 +822,9 @@ class AbstractBasicAuthHandler:
self.add_password = self.passwd.add_password self.add_password = self.passwd.add_password
self.retried = 0 self.retried = 0
def reset_retry_count(self):
self.retried = 0
def http_error_auth_reqed(self, authreq, host, req, headers): def http_error_auth_reqed(self, authreq, host, req, headers):
# host may be an authority (without userinfo) or a URL with an # host may be an authority (without userinfo) or a URL with an
# authority # authority
@ -861,8 +864,10 @@ class HTTPBasicAuthHandler(AbstractBasicAuthHandler, BaseHandler):
def http_error_401(self, req, fp, code, msg, headers): def http_error_401(self, req, fp, code, msg, headers):
url = req.get_full_url() url = req.get_full_url()
return self.http_error_auth_reqed('www-authenticate', response = self.http_error_auth_reqed('www-authenticate',
url, req, headers) url, req, headers)
self.reset_retry_count()
return response
class ProxyBasicAuthHandler(AbstractBasicAuthHandler, BaseHandler): class ProxyBasicAuthHandler(AbstractBasicAuthHandler, BaseHandler):
@ -875,8 +880,10 @@ class ProxyBasicAuthHandler(AbstractBasicAuthHandler, BaseHandler):
# should not, RFC 3986 s. 3.2.1) support requests for URLs containing # should not, RFC 3986 s. 3.2.1) support requests for URLs containing
# userinfo. # userinfo.
authority = req.get_host() authority = req.get_host()
return self.http_error_auth_reqed('proxy-authenticate', response = self.http_error_auth_reqed('proxy-authenticate',
authority, req, headers) authority, req, headers)
self.reset_retry_count()
return response
def randombytes(n): def randombytes(n):