[Python-checkins] cpython (2.7): Issue #22095: Fixed HTTPConnection.set_tunnel with default port. The port
serhiy.storchaka
python-checkins at python.org
Thu May 28 21:37:54 CEST 2015
https://hg.python.org/cpython/rev/3b6e0720a69d
changeset: 96341:3b6e0720a69d
branch: 2.7
parent: 96336:17d3bbde60d2
user: Serhiy Storchaka <storchaka at gmail.com>
date: Thu May 28 22:37:13 2015 +0300
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/httplib.py | 7 +++----
Lib/test/test_httplib.py | 8 +++++---
Misc/NEWS | 3 +++
3 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/Lib/httplib.py b/Lib/httplib.py
--- a/Lib/httplib.py
+++ b/Lib/httplib.py
@@ -772,8 +772,7 @@
if self.sock:
raise RuntimeError("Can't setup 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,8 +801,8 @@
self.debuglevel = level
def _tunnel(self):
- (host, port) = self._get_hostport(self._tunnel_host, self._tunnel_port)
- self.send("CONNECT %s:%d HTTP/1.0\r\n" % (host, port))
+ self.send("CONNECT %s:%d HTTP/1.0\r\n" % (self._tunnel_host,
+ self._tunnel_port))
for header, value in self._tunnel_headers.iteritems():
self.send("%s: %s\r\n" % (header, value))
self.send("\r\n")
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
@@ -842,10 +842,12 @@
self.assertEqual(conn.sock.host, 'proxy.com')
self.assertEqual(conn.sock.port, 80)
- self.assertTrue('CONNECT destination.com' in conn.sock.data)
- self.assertTrue('Host: destination.com' in conn.sock.data)
+ self.assertIn('CONNECT destination.com', conn.sock.data)
+ # issue22095
+ self.assertNotIn('Host: destination.com:None', conn.sock.data)
+ self.assertIn('Host: destination.com', conn.sock.data)
- self.assertTrue('Host: proxy.com' not in conn.sock.data)
+ self.assertNotIn('Host: proxy.com', conn.sock.data)
conn.close()
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -22,6 +22,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 #24257: Fixed segmentation fault in sqlite3.Row constructor with faked
cursor type.
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list