summaryrefslogtreecommitdiffstats
path: root/Lib/urllib2.py
diff options
context:
space:
mode:
authorFacundo Batista <facundobatista@gmail.com>2008-08-16 14:44:07 (GMT)
committerFacundo Batista <facundobatista@gmail.com>2008-08-16 14:44:07 (GMT)
commiteb90b788f44fae967e969e967e2bd2276f3c6597 (patch)
tree032583c2acf53f760f58fec052cde55596c3a50d /Lib/urllib2.py
parent5b02ef3e1b444372bda5b80d8646eb0afc00636d (diff)
downloadcpython-eb90b788f44fae967e969e967e2bd2276f3c6597.zip
cpython-eb90b788f44fae967e969e967e2bd2276f3c6597.tar.gz
cpython-eb90b788f44fae967e969e967e2bd2276f3c6597.tar.bz2
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.
Diffstat (limited to 'Lib/urllib2.py')
-rw-r--r--Lib/urllib2.py12
1 files changed, 9 insertions, 3 deletions
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):