mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-25 19:24:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

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

Browse source 
value in the host header was set to "None".  Patch by Demian Brecht.
This commit is contained in:
Serhiy Storchaka 2014-12-12 09:29:15 +02:00
parent 1e40f10886
commit 4ac7ed97a8
3 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/http/client.py
View file

@ -771,8 +771,7 @@ class HTTPConnection:
if self.sock: if self.sock:
raise RuntimeError("Can't set up tunnel for established connection") raise RuntimeError("Can't set up tunnel for established connection")
self._tunnel_host = host self._tunnel_host, self._tunnel_port = self._get_hostport(host, port)
self._tunnel_port = port
if headers: if headers:
self._tunnel_headers = headers self._tunnel_headers = headers
else: else:
@ -802,9 +801,8 @@ class HTTPConnection:
self.debuglevel = level self.debuglevel = level
def _tunnel(self): def _tunnel(self):
(host, port) = self._get_hostport(self._tunnel_host, connect_str = "CONNECT %s:%d HTTP/1.0\r\n" % (self._tunnel_host,
self._tunnel_port) self._tunnel_port)
connect_str = "CONNECT %s:%d HTTP/1.0\r\n" % (host, port)
connect_bytes = connect_str.encode("ascii") connect_bytes = connect_str.encode("ascii")
self.send(connect_bytes) self.send(connect_bytes)
for header, value in self._tunnel_headers.items(): for header, value in self._tunnel_headers.items():

8
Lib/test/test_httplib.py
View file

@ -1068,11 +1068,13 @@ class TunnelTests(TestCase):
self.assertEqual(conn.sock.host, 'proxy.com') self.assertEqual(conn.sock.host, 'proxy.com')
self.assertEqual(conn.sock.port, 80) self.assertEqual(conn.sock.port, 80)
self.assertTrue(b'CONNECT destination.com' in conn.sock.data) self.assertIn(b'CONNECT destination.com', conn.sock.data)
self.assertTrue(b'Host: destination.com' in 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 # 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.close()
conn.request('PUT', '/', '') conn.request('PUT', '/', '')

3
Misc/NEWS
View file

@ -39,6 +39,9 @@ Core and Builtins
Library 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 - Issue #23016: A warning no longer produces an AttributeError when the program
is run with pythonw.exe. is run with pythonw.exe.