backport ipv6 address fix

1 files changed, 5 insertions, 2 deletions

diff --git a/Lib/httplib.py b/Lib/httplib.py
index 40fad26c87..0b6a9d2db3 100644
--- a/Lib/httplib.py
+++ b/Lib/httplib.py
@@ -510,8 +510,9 @@ class HTTPConnection:
 
     def _set_hostport(self, host, port):
         if port is None:
-            i = host.find(':')
-            if i >= 0:
+            i = host.rfind(':')
+            j = host.rfind(']')         # ipv6 addresses have [...]
+            if i > j:
                 try:
                     port = int(host[i+1:])
                 except ValueError:
@@ -519,6 +520,8 @@ class HTTPConnection:
                 host = host[:i]
             else:
                 port = self.default_port
+            if host[0] == '[' and host[-1] == ']':
+                host = host[1:-1]
         self.host = host
         self.port = port