Skip to content
This repository was archived by the owner on Jan 13, 2021. It is now read-only.

Validate ipv6 support #172

Merged
Lukasa merged 15 commits into from
Nov 18, 2015
Merged

Validate ipv6 support #172

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
4f23977
Add utility function to properly handle and split hostnames and IPs f…
fredthomsen Oct 16, 2015
4ec8b83
Change http11 and http20 constructors to use new utility function for…
fredthomsen Oct 16, 2015
4a2aeea
Update CLI to use new utility function
fredthomsen Oct 16, 2015
e6031a9
Add host and proxy ipv6 test cases
fredthomsen Oct 16, 2015
f3505e1
Fix syntax errors and import issues
fredthomsen Oct 16, 2015
d6b7ccc
Fix to_host_port_tuple to resolve test case issues
fredthomsen Oct 16, 2015
7016773
Change to_host_port_tuple to use regex and update default port
fredthomsen Oct 18, 2015
54fc80c
Fix test case to match updated default port in to_host_port_tuple
fredthomsen Oct 18, 2015
63b1a6f
Vendor rfc3986 package
fredthomsen Nov 10, 2015
4fff8b4
Add rfc986 licensing information to its directory and NOTICES file
fredthomsen Nov 11, 2015
a4480c1
Use URIReference in to_host_port_tuple
fredthomsen Nov 17, 2015
b779e33
to_host_port_tuple should strip bracket for IPv6 addresses for return…
fredthomsen Nov 17, 2015
b6f3060
Update test cases to reflect that ipv6 addresses must be surrounded b…
fredthomsen Nov 17, 2015
3b0ac19
Make changes specified in code review
fredthomsen Nov 17, 2015
e8dd399
Add rfc3986 package to setup list
Nov 17, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Change http11 and http20 constructors to use new utility function for… 
… host and proxy
  • Loading branch information
@fredthomsen
fredthomsen committed Oct 16, 2015
commit 4ec8b836a26ef8de3d57d2c5c6f1f4213dfa2cc0
13 changes: 2 additions & 11 deletions hyper/http11/connection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,7 @@ class HTTP11Connection(object):
def __init__(self, host, port=None, secure=None, ssl_context=None,
proxy_host=None, proxy_port=None, **kwargs):
if port is None:
try:
self.host, self.port = host.split(':')
self.port = int(self.port)
except ValueError:
self.host, self.port = host, 80
self.host, self.port = to_host_port_tuple(host)
Copy link
Member

@Lukasa Lukasa Nov 17, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's be explicit about the default port here too.

else:
self.host, self.port = host, port

Expand All @@ -83,12 +79,7 @@ def __init__(self, host, port=None, secure=None, ssl_context=None,
# Setup proxy details if applicable.
if proxy_host:
if proxy_port is None:
try:
self.proxy_host, self.proxy_port = proxy_host.split(':')
except ValueError:
self.proxy_host, self.proxy_port = proxy_host, 8080
else:
self.proxy_port = int(self.proxy_port)
self.proxy_host, self.proxy_port = to_host_port_tuple(proxy_host, default_port=8080)
else:
self.proxy_host, self.proxy_port = proxy_host, proxy_port
else:
Expand Down
13 changes: 2 additions & 11 deletions hyper/http20/connection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,7 @@ def __init__(self, host, port=None, secure=None, window_manager=None, enable_pus
Creates an HTTP/2 connection to a specific server.
"""
if port is None:
try:
self.host, self.port = host.split(':')
self.port = int(self.port)
except ValueError:
self.host, self.port = host, 443
self.host, self.port = to_host_port_tuple(host)
else:
self.host, self.port = host, port

Expand All @@ -88,12 +84,7 @@ def __init__(self, host, port=None, secure=None, window_manager=None, enable_pus
# Setup proxy details if applicable.
if proxy_host:
if proxy_port is None:
try:
self.proxy_host, self.proxy_port = proxy_host.split(':')
except ValueError:
self.proxy_host, self.proxy_port = proxy_host, 8080
else:
self.proxy_port = int(self.proxy_port)
self.proxy_host, self.proxy_port = to_host_port_tuple(proxy_host, default_port=8080)
else:
self.proxy_host, self.proxy_port = proxy_host, proxy_port
else:
Expand Down