From: Martin v. Löwis <martin@v.loewis.de>
Date: Tue, 3 Aug 2004 13:00:52 +0000 (+0000)
Subject: Patch #994595: Recognize Basic auth even if other schemes are offered.
X-Git-Tag: v2.3.5c1~144
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a7d9137a5dcadc82a178394b35a885ce37a8d19e;p=thirdparty%2FPython%2Fcpython.git

Patch #994595: Recognize Basic auth even if other schemes are offered.
---

diff --git a/Lib/urllib2.py b/Lib/urllib2.py
index d136485cd012..e45978ed1422 100644
--- a/Lib/urllib2.py
+++ b/Lib/urllib2.py
@@ -631,7 +631,7 @@ class AbstractBasicAuthHandler:
         # XXX could be multiple headers
         authreq = headers.get(authreq, None)
         if authreq:
-            mo = AbstractBasicAuthHandler.rx.match(authreq)
+            mo = AbstractBasicAuthHandler.rx.search(authreq)
             if mo:
                 scheme, realm = mo.groups()
                 if scheme.lower() == 'basic':
diff --git a/Misc/NEWS b/Misc/NEWS
index 033db637534c..df53b7682b1a 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -43,6 +43,9 @@ Extension modules
 Library
 -------
 
+- Patch #994595: urllib2 now recognizes Basic authentication even if
+  other authentication schemes are offered.
+
 - Bug #993394.  A KeyError was being raised by Thread.__delete() for
   dummy_threading when called by atexit if an instance of Thread was created in
   an interpreter running in -O.  The exception was of no importance and thus is