mirror of
https://github.com/python/cpython
synced 2024-09-22 07:41:37 +00:00
Fix Issue5111 - Wrap the Ipv6 host with [] in the Host header
This commit is contained in:
parent
5ccafbadda
commit
74ebd9e6a3
|
@ -874,6 +874,13 @@ def putrequest(self, method, url, skip_host=0, skip_accept_encoding=0):
|
|||
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:
|
||||
|
|
|
@ -106,6 +106,25 @@ def test_putheader(self):
|
|||
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):
|
||||
|
|
Loading…
Reference in a new issue