mirror of
https://github.com/python/cpython.git
synced 2025-09-26 18:29:57 +00:00
Fix Issue5111 - Wrap the Ipv6 host with [] in the Host header
This commit is contained in:
parent
5ccafbadda
commit
74ebd9e6a3
3 changed files with 28 additions and 0 deletions
|
@ -874,6 +874,13 @@ class HTTPConnection:
|
||||||
host_enc = self.host.encode("ascii")
|
host_enc = self.host.encode("ascii")
|
||||||
except UnicodeEncodeError:
|
except UnicodeEncodeError:
|
||||||
host_enc = self.host.encode("idna")
|
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:
|
if self.port == self.default_port:
|
||||||
self.putheader('Host', host_enc)
|
self.putheader('Host', host_enc)
|
||||||
else:
|
else:
|
||||||
|
|
|
@ -106,6 +106,25 @@ class HeaderTests(TestCase):
|
||||||
conn.putheader('Content-length', 42)
|
conn.putheader('Content-length', 42)
|
||||||
self.assertTrue(b'Content-length: 42' in conn._buffer)
|
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):
|
class BasicTest(TestCase):
|
||||||
def test_status_lines(self):
|
def test_status_lines(self):
|
||||||
|
|
|
@ -63,6 +63,8 @@ Core and Builtins
|
||||||
Library
|
Library
|
||||||
-------
|
-------
|
||||||
|
|
||||||
|
- Issue #5111: IPv6 Host in the Header is wrapped inside [ ]. Patch by Chandru.
|
||||||
|
|
||||||
- Fix Fraction.__hash__ so that Fraction.__hash__(-1) is -2. (See
|
- Fix Fraction.__hash__ so that Fraction.__hash__(-1) is -2. (See
|
||||||
also issue #10356.)
|
also issue #10356.)
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue