From: Senthil Kumaran <orsenthil@gmail.com>
Date: Sun, 15 Nov 2009 08:36:20 +0000 (+0000)
Subject: Fix for Issue4683 - urllib2.HTTPDigestAuthHandler fails on third hostname?.
X-Git-Tag: v2.7a1~104
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20eb4f078237e8bc7a5ac970714cee4d8feb7a09;p=thirdparty%2FPython%2Fcpython.git

Fix for Issue4683 - urllib2.HTTPDigestAuthHandler fails on third hostname?.
Resolution: Reset the nonce value for each unique nonce (as per RFC 2617)
---

diff --git a/Lib/urllib2.py b/Lib/urllib2.py
index 2d73475a8eb7..8dcf8dad5889 100644
--- a/Lib/urllib2.py
+++ b/Lib/urllib2.py
@@ -901,6 +901,7 @@ class AbstractDigestAuthHandler:
         self.add_password = self.passwd.add_password
         self.retried = 0
         self.nonce_count = 0
+        self.last_nonce = None
 
     def reset_retry_count(self):
         self.retried = 0
@@ -975,7 +976,12 @@ class AbstractDigestAuthHandler:
                         # XXX selector: what about proxies and full urls
                         req.get_selector())
         if qop == 'auth':
-            self.nonce_count += 1
+            if nonce == self.last_nonce:
+                self.nonce_count += 1
+            else:
+                self.nonce_count = 1
+                self.last_nonce = nonce
+
             ncvalue = '%08x' % self.nonce_count
             cnonce = self.get_cnonce(nonce)
             noncebit = "%s:%s:%s:%s:%s" % (nonce, ncvalue, cnonce, qop, H(A2))