summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Lib/urllib2.py8
-rw-r--r--Misc/NEWS3
2 files changed, 11 insertions, 0 deletions
diff --git a/Lib/urllib2.py b/Lib/urllib2.py
index 121685c..7b209d4 100644
--- a/Lib/urllib2.py
+++ b/Lib/urllib2.py
@@ -560,6 +560,14 @@ class HTTPRedirectHandler(BaseHandler):
newurl = headers.getheaders('uri')[0]
else:
return
+
+ # fix a possible malformed URL
+ urlparts = urlparse.urlparse(newurl)
+ if not urlparts.path:
+ urlparts = list(urlparts)
+ urlparts[2] = "/"
+ newurl = urlparse.urlunparse(urlparts)
+
newurl = urlparse.urljoin(req.get_full_url(), newurl)
# XXX Probably want to forget about the state of the current
diff --git a/Misc/NEWS b/Misc/NEWS
index 7736ca7..08ee9f9 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -48,6 +48,9 @@ Core and Builtins
Library
-------
+- Issue 2464. urllib2 now supports a malformation in the URL received
+ in a redirect.
+
- Silence the DeprecationWarning raised when importing mimetools in
BaseHTTPServer, cgi (and rfc822), httplib.