Issue #22095: Fixed HTTPConnection.set_tunnel with default port. The port

value in the host header was set to "None".  Patch by Demian Brecht.
This commit is contained in:
Serhiy Storchaka 2014-12-12 09:30:18 +02:00
commit d4a001b23c
3 changed files with 11 additions and 8 deletions

View File

@ -835,8 +835,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:
@ -866,9 +865,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():

View File

@ -1299,11 +1299,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', '/', '')

View File

@ -194,6 +194,9 @@ Core and Builtins
Library
-------
- Issue #22095: Fixed HTTPConnection.set_tunnel with default port. The port
value in the host header was set to "None". Patch by Demian Brecht.
- Issue #23016: A warning no longer produces an AttributeError when the program
is run with pythonw.exe.