From 72dc1eadd918dc9ddd6a30149d90617d706a0b19 Mon Sep 17 00:00:00 2001 From: Facundo Batista Date: Sat, 16 Aug 2008 14:44:32 +0000 Subject: 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. --- Lib/urllib/request.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'Lib/urllib/request.py') diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py index c050ed85c2..428be4acef 100644 --- a/Lib/urllib/request.py +++ b/Lib/urllib/request.py @@ -231,6 +231,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 @@ -1010,10 +1013,12 @@ 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): -- cgit v1.2.1