From: Senthil Kumaran <orsenthil@gmail.com>
Date: Sun, 15 Nov 2009 08:45:27 +0000 (+0000)
Subject: Merged revisions 76290 via svnmerge from
X-Git-Tag: v3.1.2rc1~339
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b58474f8c7d78057debf4d50854faf358b81e5b6;p=python

Merged revisions 76290 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r76290 | senthil.kumaran | 2009-11-15 14:13:45 +0530 (Sun, 15 Nov 2009) | 10 lines

  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/urllib/request.py b/Lib/urllib/request.py
index 4ed46ff0b5..b977099ce4 100644
--- a/Lib/urllib/request.py
+++ b/Lib/urllib/request.py
@@ -847,6 +847,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
@@ -922,7 +923,11 @@ class AbstractDigestAuthHandler:
                         # XXX selector: what about proxies and full urls
                         req.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))