Backport the changes made in revision 74198, fixing the issue 1424152
diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py
index b133fe4..f787407 100644
--- a/Lib/urllib/request.py
+++ b/Lib/urllib/request.py
@@ -163,6 +163,7 @@
self.full_url = unwrap(url)
self.data = data
self.headers = {}
+ self._tunnel_host = None
for key, value in headers.items():
self.add_header(key, value)
self.unredirected_hdrs = {}
@@ -218,8 +219,12 @@
# End deprecated methods
def set_proxy(self, host, type):
- self.host, self.type = host, type
- self.selector = self.full_url
+ if self.type == 'https' and not self._tunnel_host:
+ self._tunnel_host = self.host
+ else:
+ self.type= type
+ self.selector = self.full_url
+ self.host = host
def has_proxy(self):
return self.selector == self.full_url
@@ -659,7 +664,7 @@
req.add_header('Proxy-authorization', 'Basic ' + creds)
hostport = unquote(hostport)
req.set_proxy(hostport, proxy_type)
- if orig_type == proxy_type:
+ if orig_type == proxy_type or orig_type == 'https':
# let other handlers take care of it
return None
else:
@@ -1041,6 +1046,10 @@
# request.
headers["Connection"] = "close"
headers = dict((name.title(), val) for name, val in headers.items())
+
+ if req._tunnel_host:
+ h._set_tunnel(req._tunnel_host)
+
try:
h.request(req.get_method(), req.selector, req.data, headers)
r = h.getresponse() # an HTTPResponse instance