Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
74ebd9e6
Commit
74ebd9e6
authored
Nov 13, 2010
by
Senthil Kumaran
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Issue5111 - Wrap the Ipv6 host with [] in the Host header
parent
5ccafbad
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
0 deletions
+28
-0
Lib/http/client.py
Lib/http/client.py
+7
-0
Lib/test/test_httplib.py
Lib/test/test_httplib.py
+19
-0
Misc/NEWS
Misc/NEWS
+2
-0
No files found.
Lib/http/client.py
View file @
74ebd9e6
...
...
@@ -874,6 +874,13 @@ class HTTPConnection:
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
:
...
...
Lib/test/test_httplib.py
View file @
74ebd9e6
...
...
@@ -106,6 +106,25 @@ class HeaderTests(TestCase):
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
\
n
Host: [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
\
n
Host: [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
):
...
...
Misc/NEWS
View file @
74ebd9e6
...
...
@@ -63,6 +63,8 @@ Core and Builtins
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
also issue #10356.)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment