[Python-checkins] python/dist/src/Lib httplib.py,1.79.8.2,1.79.8.3

[montanaro at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22458/Lib

Modified Files:
      Tag: release23-maint
	httplib.py 
Log Message:
backport ipv6 address fix


Index: httplib.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/httplib.py,v
retrieving revision 1.79.8.2
retrieving revision 1.79.8.3
diff -u -d -r1.79.8.2 -r1.79.8.3
--- httplib.py	2 Nov 2003 16:51:38 -0000	1.79.8.2
+++ httplib.py	16 Sep 2004 03:31:21 -0000	1.79.8.3
@@ -510,8 +510,9 @@
 
     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 @@
                 host = host[:i]
             else:
                 port = self.default_port
+            if host[0] == '[' and host[-1] == ']':
+                host = host[1:-1]
         self.host = host
         self.port = port