[Python-checkins] cpython (3.4): Issue #22095: Fixed HTTPConnection.set_tunnel with default port. The port
serhiy.storchaka
python-checkins at python.org
Fri Dec 12 08:32:38 CET 2014
https://hg.python.org/cpython/rev/676d6bcfc031
changeset: 93839:676d6bcfc031
branch: 3.4
parent: 93836:17f5ddf15ced
user: Serhiy Storchaka <storchaka at gmail.com>
date: Fri Dec 12 09:29:15 2014 +0200
summary:
Issue #22095: Fixed HTTPConnection.set_tunnel with default port. The port
value in the host header was set to "None". Patch by Demian Brecht.
files:
Lib/http/client.py | 8 +++-----
Lib/test/test_httplib.py | 8 +++++---
Misc/NEWS | 3 +++
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/Lib/http/client.py b/Lib/http/client.py
--- a/Lib/http/client.py
+++ b/Lib/http/client.py
@@ -771,8 +771,7 @@
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 @@
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
--- a/Lib/test/test_httplib.py
+++ b/Lib/test/test_httplib.py
@@ -1068,11 +1068,13 @@
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', '/', '')
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -39,6 +39,9 @@
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.
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list