diff options
| author | Skip Montanaro <skip@pobox.com> | 2004-09-14 16:32:02 (GMT) |
|---|---|---|
| committer | Skip Montanaro <skip@pobox.com> | 2004-09-14 16:32:02 (GMT) |
| commit | 10e6e0e61a38d62979fb5270d2e19a235ba32bbe (patch) | |
| tree | e92222d59609f2590c6af4ab55309c8c14f2cd0f | |
| parent | 065a32f5508152a4d9781e611185c48ab46ed108 (diff) | |
| download | cpython-10e6e0e61a38d62979fb5270d2e19a235ba32bbe.zip cpython-10e6e0e61a38d62979fb5270d2e19a235ba32bbe.tar.gz cpython-10e6e0e61a38d62979fb5270d2e19a235ba32bbe.tar.bz2 | |
Search from the end of the host/port combination to find the colon which
separates ip address from the port to accommodate ipv6 addresses.
| -rw-r--r-- | Lib/httplib.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_httplib.py | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/Lib/httplib.py b/Lib/httplib.py index a4102ea..2f117d8 100644 --- a/Lib/httplib.py +++ b/Lib/httplib.py @@ -524,7 +524,7 @@ class HTTPConnection: def _set_hostport(self, host, port): if port is None: - i = host.find(':') + i = host.rfind(':') if i >= 0: try: port = int(host[i+1:]) diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py index 5f252bb..b49f71d 100644 --- a/Lib/test/test_httplib.py +++ b/Lib/test/test_httplib.py @@ -118,6 +118,13 @@ def _test(): else: print "Expect InvalidURL" + for hp in ("[fe80::207:e9ff:fe9b]:8000", "www.python.org:80", + "www.python.org"): + try: + h = httplib.HTTP(hp) + except httplib.InvalidURL: + print "InvalidURL raised erroneously" + # test response with multiple message headers with the same field name. text = ('HTTP/1.1 200 OK\r\n' 'Set-Cookie: Customer="WILE_E_COYOTE"; Version="1"; Path="/acme"\r\n' |