mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-04 06:06:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Merged revisions 76288 via svnmerge from

Browse source 
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)
........
This commit is contained in:
Senthil Kumaran 2009-11-15 08:39:10 +00:00
parent 38b5dd13eb
commit 10c858ac4d
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/urllib2.py
View file

@ -901,6 +901,7 @@ class AbstractDigestAuthHandler:
self.add_password = self.passwd.add_password self.add_password = self.passwd.add_password
self.retried = 0 self.retried = 0
self.nonce_count = 0 self.nonce_count = 0
self.last_nonce = None
def reset_retry_count(self): def reset_retry_count(self):
self.retried = 0 self.retried = 0
@ -975,7 +976,12 @@ class AbstractDigestAuthHandler:
# XXX selector: what about proxies and full urls # XXX selector: what about proxies and full urls
req.get_selector()) req.get_selector())
if qop == 'auth': 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 ncvalue = '%08x' % self.nonce_count
cnonce = self.get_cnonce(nonce) cnonce = self.get_cnonce(nonce)
noncebit = "%s:%s:%s:%s:%s" % (nonce, ncvalue, cnonce, qop, H(A2)) noncebit = "%s:%s:%s:%s:%s" % (nonce, ncvalue, cnonce, qop, H(A2))