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.
........

diff --git a/Lib/urllib2.py b/Lib/urllib2.py
index 08217613ebde28212a7a2acae43409a45ae01dd1..5c717a4c5d9b84d0d4ceabf3dbf0d216998a80d7 100644 (file)
--- a/Lib/urllib2.py
+++ b/Lib/urllib2.py
@@ -843,7 +843,10 @@ class AbstractBasicAuthHandler:
             if mo:
                 scheme, quote, realm = mo.groups()
                 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):
         user, pw = self.passwd.find_user_password(realm, host)

diff --git a/Misc/NEWS b/Misc/NEWS
index fcd4ae00617c0a0821c13a6984674a4fe3bdf588..deceec4fb5c55c506007c6013540a11d942ee0e1 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -33,6 +33,9 @@ Core and Builtins
 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
   character years even if the message contains RFC822 two character years.