[Python-checkins] r76288 - python/trunk/Lib/urllib2.py

Sun Nov 15 09:36:21 CET 2009

Author: senthil.kumaran
Date: Sun Nov 15 09:36:20 2009
New Revision: 76288
Log:
Fix for Issue4683 - urllib2.HTTPDigestAuthHandler fails on third hostname?.
Resolution: Reset the nonce value for each unique nonce (as per RFC 2617)
Modified:
 python/trunk/Lib/urllib2.py
Modified: python/trunk/Lib/urllib2.py
==============================================================================

--- python/trunk/Lib/urllib2.py	(original)
+++ python/trunk/Lib/urllib2.py	Sun Nov 15 09:36:20 2009
@@ -901,6 +901,7 @@
 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 @@
 # 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))
