[Python-checkins] r78423 - in python/branches/release26-maint: Lib/test/test_urllib2.py Lib/urllib2.py

[senthil.kumaran]

Author: senthil.kumaran
Date: Wed Feb 24 17:49:45 2010
New Revision: 78423

Log:
Merged revisions 78422 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78422 | senthil.kumaran | 2010-02-24 22:15:46 +0530 (Wed, 24 Feb 2010) | 2 lines
  
  Fix for Issue3819 - urllib2 sends Basic auth across redirects
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Lib/test/test_urllib2.py
   python/branches/release26-maint/Lib/urllib2.py

Modified: python/branches/release26-maint/Lib/test/test_urllib2.py
==============================================================================
--- python/branches/release26-maint/Lib/test/test_urllib2.py	(original)
+++ python/branches/release26-maint/Lib/test/test_urllib2.py	Wed Feb 24 17:49:45 2010
@@ -1134,7 +1134,8 @@
         auth_hdr_value = 'Basic '+base64.encodestring(userpass).strip()
         self.assertEqual(http_handler.requests[1].get_header(auth_header),
                          auth_hdr_value)
-
+        self.assertEqual(http_handler.requests[1].unredirected_hdrs[auth_header],
+                         auth_hdr_value)
         # if the password manager can't find a password, the handler won't
         # handle the HTTP auth error
         password_manager.user = password_manager.password = None

Modified: python/branches/release26-maint/Lib/urllib2.py
==============================================================================
--- python/branches/release26-maint/Lib/urllib2.py	(original)
+++ python/branches/release26-maint/Lib/urllib2.py	Wed Feb 24 17:49:45 2010
@@ -839,7 +839,7 @@
             auth = 'Basic %s' % base64.b64encode(raw).strip()
             if req.headers.get(self.auth_header, None) == auth:
                 return None
-            req.add_header(self.auth_header, auth)
+            req.add_unredirected_header(self.auth_header, auth)
             return self.parent.open(req, timeout=req.timeout)
         else:
             return None