Merged revisions 76288 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76288 | senthil.kumaran | 2009-11-15 14:06:20 +0530 (Sun, 15 Nov 2009) | 3 lines

  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 17786758148c49821004c570d2878c2af2943d3b..03bd5f8af2cd380122cd6f0db52a156d2d08493f 100644 (file)
--- 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))