From: Senthil Kumaran <orsenthil@gmail.com>
Date: Thu, 26 Aug 2010 06:16:22 +0000 (+0000)
Subject: Fix Issue8797 - Reset the basic auth retry count when response code is not 401.
X-Git-Tag: v3.2a2~133
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4bb5c273c6897682d99badb872d532806d1e7210;p=thirdparty%2FPython%2Fcpython.git

Fix Issue8797 - Reset the basic auth retry count when response code is not 401.
---

diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py
index 68a8cabda1be..16d81252d310 100644
--- a/Lib/urllib/request.py
+++ b/Lib/urllib/request.py
@@ -799,7 +799,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 ecb1a4f4a098..7ef147d22ce8 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -132,6 +132,9 @@ Extensions
 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.