[Python-checkins] r86461 - in python/branches/release31-maint: Lib/http/client.py Lib/test/test_httplib.py Misc/NEWS
senthil.kumaran
python-checkins at python.org
Sun Nov 14 04:14:52 CET 2010
Author: senthil.kumaran
Date: Sun Nov 14 04:14:52 2010
New Revision: 86461
Log:
Merged revisions 86450 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r86450 | senthil.kumaran | 2010-11-13 20:27:49 +0800 (Sat, 13 Nov 2010) | 3 lines
Fix Issue5111 - Wrap the Ipv6 host with [] in the Host header
........
Modified:
python/branches/release31-maint/ (props changed)
python/branches/release31-maint/Lib/http/client.py
python/branches/release31-maint/Lib/test/test_httplib.py
python/branches/release31-maint/Misc/NEWS
Modified: python/branches/release31-maint/Lib/http/client.py
==============================================================================
--- python/branches/release31-maint/Lib/http/client.py (original)
+++ python/branches/release31-maint/Lib/http/client.py Sun Nov 14 04:14:52 2010
@@ -873,6 +873,13 @@
host_enc = self.host.encode("ascii")
except UnicodeEncodeError:
host_enc = self.host.encode("idna")
+
+ # As per RFC 273, IPv6 address should be wrapped with []
+ # when used as Host header
+
+ if self.host.find(':') >= 0:
+ host_enc = b'[' + host_enc + b']'
+
if self.port == self.default_port:
self.putheader('Host', host_enc)
else:
Modified: python/branches/release31-maint/Lib/test/test_httplib.py
==============================================================================
--- python/branches/release31-maint/Lib/test/test_httplib.py (original)
+++ python/branches/release31-maint/Lib/test/test_httplib.py Sun Nov 14 04:14:52 2010
@@ -96,6 +96,25 @@
conn.putheader('Content-length', 42)
self.assertTrue(b'Content-length: 42' in conn._buffer)
+ def test_ipv6host_header(self):
+ # Default host header on IPv6 transaction should wrapped by [] if
+ # its actual IPv6 address
+ expected = b'GET /foo HTTP/1.1\r\nHost: [2001::]:81\r\n' \
+ b'Accept-Encoding: identity\r\n\r\n'
+ conn = client.HTTPConnection('[2001::]:81')
+ sock = FakeSocket('')
+ conn.sock = sock
+ conn.request('GET', '/foo')
+ self.assertTrue(sock.data.startswith(expected))
+
+ expected = b'GET /foo HTTP/1.1\r\nHost: [2001:102A::]\r\n' \
+ b'Accept-Encoding: identity\r\n\r\n'
+ conn = client.HTTPConnection('[2001:102A::]')
+ sock = FakeSocket('')
+ conn.sock = sock
+ conn.request('GET', '/foo')
+ self.assertTrue(sock.data.startswith(expected))
+
class BasicTest(TestCase):
def test_status_lines(self):
Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS (original)
+++ python/branches/release31-maint/Misc/NEWS Sun Nov 14 04:14:52 2010
@@ -155,6 +155,8 @@
Library
-------
+- Issue #5111: IPv6 Host in the Header is wrapped inside [ ]. Patch by Chandru.
+
- Issue #4471: Properly shutdown socket in IMAP.shutdown(). Patch by
Lorenzo M. Catucci.
More information about the Python-checkins
mailing list