summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2004-08-03 12:59:55 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2004-08-03 12:59:55 (GMT)
commit65a7975f16f92f0e715a16b807f732c0d7a34bf0 (patch)
tree46fa7085e1ae348e91b06029f02debdf0ecd4b07
parent7db57b3b419897d93ca2fa75a0cb0a03c25916fd (diff)
downloadcpython-65a7975f16f92f0e715a16b807f732c0d7a34bf0.zip
cpython-65a7975f16f92f0e715a16b807f732c0d7a34bf0.tar.gz
cpython-65a7975f16f92f0e715a16b807f732c0d7a34bf0.tar.bz2
Patch #994595: Recognize Basic auth even if other schemes are offered.
Will backport to 2.3.
-rw-r--r--Lib/urllib2.py2
-rw-r--r--Misc/NEWS3
2 files changed, 4 insertions, 1 deletions
diff --git a/Lib/urllib2.py b/Lib/urllib2.py
index 8d38749..c525f8c 100644
--- a/Lib/urllib2.py
+++ b/Lib/urllib2.py
@@ -714,7 +714,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 edd5989..291cc77 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -72,6 +72,9 @@ Extension modules
Library
-------
+- urllib2 now recognizes Basic authentication even if other authentication
+ schemes are offered.
+
- Bug #1001053. wave.open() now accepts unicode filenames.
- gzip.GzipFile has a new fileno() method, to retrieve the handle of the