From 4ac7ed97a8cabb5dba6aa25e32cd59d9854dda90 Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Fri, 12 Dec 2014 09:29:15 +0200 Subject: Issue #22095: Fixed HTTPConnection.set_tunnel with default port. The port value in the host header was set to "None". Patch by Demian Brecht. --- Lib/http/client.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'Lib/http/client.py') diff --git a/Lib/http/client.py b/Lib/http/client.py index c0760ddeb6..6de4b0e73c 100644 --- a/Lib/http/client.py +++ b/Lib/http/client.py @@ -771,8 +771,7 @@ class HTTPConnection: if self.sock: raise RuntimeError("Can't set up tunnel for established connection") - self._tunnel_host = host - self._tunnel_port = port + self._tunnel_host, self._tunnel_port = self._get_hostport(host, port) if headers: self._tunnel_headers = headers else: @@ -802,9 +801,8 @@ class HTTPConnection: self.debuglevel = level def _tunnel(self): - (host, port) = self._get_hostport(self._tunnel_host, - self._tunnel_port) - connect_str = "CONNECT %s:%d HTTP/1.0\r\n" % (host, port) + connect_str = "CONNECT %s:%d HTTP/1.0\r\n" % (self._tunnel_host, + self._tunnel_port) connect_bytes = connect_str.encode("ascii") self.send(connect_bytes) for header, value in self._tunnel_headers.items(): -- cgit v1.2.1