Commit 06509381 authored by Senthil Kumaran's avatar Senthil Kumaran

Merged revisions 84323 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84323 | senthil.kumaran | 2010-08-26 11:46:22 +0530 (Thu, 26 Aug 2010) | 3 lines

  Fix Issue8797 - Reset the basic auth retry count when response code is not 401.
........
parent 039d0a00
...@@ -799,7 +799,10 @@ class AbstractBasicAuthHandler: ...@@ -799,7 +799,10 @@ class AbstractBasicAuthHandler:
if mo: if mo:
scheme, quote, realm = mo.groups() scheme, quote, realm = mo.groups()
if scheme.lower() == 'basic': if scheme.lower() == 'basic':
return self.retry_http_basic_auth(host, req, realm) response = self.retry_http_basic_auth(host, req, realm)
if response and response.code != 401:
self.retried = 0
return response
def retry_http_basic_auth(self, host, req, realm): def retry_http_basic_auth(self, host, req, realm):
user, pw = self.passwd.find_user_password(realm, host) user, pw = self.passwd.find_user_password(realm, host)
......
...@@ -97,6 +97,9 @@ C-API ...@@ -97,6 +97,9 @@ C-API
Library Library
------- -------
- Issue #8797: urllib2 does a retry for Basic Authentication failure instead of
falling into recursion.
- Issue #1194222: email.utils.parsedate now returns RFC2822 compliant four - Issue #1194222: email.utils.parsedate now returns RFC2822 compliant four
character years even if the message contains RFC822 two character years. character years even if the message contains RFC822 two character years.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment