diff options
| -rw-r--r-- | Lib/test/test_urllib2.py | 26 | ||||
| -rw-r--r-- | Lib/urllib2.py | 12 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
3 files changed, 38 insertions, 3 deletions
diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py index 1e93fdb..e28ee71 100644 --- a/Lib/test/test_urllib2.py +++ b/Lib/test/test_urllib2.py @@ -772,6 +772,32 @@ class HandlerTests(unittest.TestCase): self.assertEqual(req.unredirected_hdrs["Host"], "baz") self.assertEqual(req.unredirected_hdrs["Spam"], "foo") + def test_http_doubleslash(self): + # Checks that the presence of an unnecessary double slash in a url doesn't break anything + # Previously, a double slash directly after the host could cause incorrect parsing of the url + h = urllib2.AbstractHTTPHandler() + o = h.parent = MockOpener() + + data = "" + ds_urls = [ + "http://example.com/foo/bar/baz.html", + "http://example.com//foo/bar/baz.html", + "http://example.com/foo//bar/baz.html", + "http://example.com/foo/bar//baz.html", + ] + + for ds_url in ds_urls: + ds_req = Request(ds_url, data) + + # Check whether host is determined correctly if there is no proxy + np_ds_req = h.do_request_(ds_req) + self.assertEqual(np_ds_req.unredirected_hdrs["Host"],"example.com") + + # Check whether host is determined correctly if there is a proxy + ds_req.set_proxy("someproxy:3128",None) + p_ds_req = h.do_request_(ds_req) + self.assertEqual(p_ds_req.unredirected_hdrs["Host"],"example.com") + def test_errors(self): h = urllib2.HTTPErrorProcessor() o = h.parent = MockOpener() diff --git a/Lib/urllib2.py b/Lib/urllib2.py index 156c6f8..121685c 100644 --- a/Lib/urllib2.py +++ b/Lib/urllib2.py @@ -255,6 +255,9 @@ class Request: self.host, self.type = host, type self.__r_host = self.__original + def has_proxy(self): + return self.__r_host == self.__original + def get_origin_req_host(self): return self.origin_req_host @@ -1045,10 +1048,13 @@ class AbstractHTTPHandler(BaseHandler): request.add_unredirected_header( 'Content-length', '%d' % len(data)) - scheme, sel = splittype(request.get_selector()) - sel_host, sel_path = splithost(sel) + sel_host = host + if request.has_proxy(): + scheme, sel = splittype(request.get_selector()) + sel_host, sel_path = splithost(sel) + if not request.has_header('Host'): - request.add_unredirected_header('Host', sel_host or host) + request.add_unredirected_header('Host', sel_host) for name, value in self.parent.addheaders: name = name.capitalize() if not request.has_header(name): @@ -48,6 +48,9 @@ Core and Builtins Library ------- +- Issue #2776: fixed small issue when handling an URL with double slash + after a 302 response in the case of not going through a proxy. + - Issue #2676: in the email package, content-type parsing was hanging on pathological input because of quadratic or exponential behaviour of a regular expression. |