diff options
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/http/client.py | 8 | ||||
| -rw-r--r-- | Lib/test/test_httplib.py | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/Lib/http/client.py b/Lib/http/client.py index c0760dd..6de4b0e 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(): diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py index 49d767d..d874339 100644 --- a/Lib/test/test_httplib.py +++ b/Lib/test/test_httplib.py @@ -1068,11 +1068,13 @@ class TunnelTests(TestCase): self.assertEqual(conn.sock.host, 'proxy.com') self.assertEqual(conn.sock.port, 80) - self.assertTrue(b'CONNECT destination.com' in conn.sock.data) - self.assertTrue(b'Host: destination.com' in conn.sock.data) + self.assertIn(b'CONNECT destination.com', conn.sock.data) + # issue22095 + self.assertNotIn(b'Host: destination.com:None', conn.sock.data) + self.assertIn(b'Host: destination.com', conn.sock.data) # This test should be removed when CONNECT gets the HTTP/1.1 blessing - self.assertTrue(b'Host: proxy.com' not in conn.sock.data) + self.assertNotIn(b'Host: proxy.com', conn.sock.data) conn.close() conn.request('PUT', '/', '') |