Patch #401196: Use getaddrinfo and AF_INET6 in TCP servers and clients.

1 files changed, 16 insertions, 4 deletions

diff --git a/Lib/httplib.py b/Lib/httplib.py
index 1e08539..d566b35 100644
--- a/Lib/httplib.py
+++ b/Lib/httplib.py
@@ -357,10 +357,22 @@ class HTTPConnection:
 
     def connect(self):
         """Connect to the host and port specified in __init__."""
-        self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        if self.debuglevel > 0:
-            print "connect: (%s, %s)" % (self.host, self.port)
-        self.sock.connect((self.host, self.port))
+ 	for res in socket.getaddrinfo(self.host, self.port, 0, socket.SOCK_STREAM):
+ 	    af, socktype, proto, canonname, sa = res
+ 	    try:
+ 		self.sock = socket.socket(af, socktype, proto)
+		if self.debuglevel > 0:
+		    print "connect: (%s, %s)" % (self.host, self.port)
+		self.sock.connect(sa)
+	    except socket.error, msg:
+		if self.debuglevel > 0:
+		    print 'connect fail:', (self.host, self.port)
+		self.sock.close()
+		self.sock = None
+		continue
+	    break
+	if not self.sock:
+	    raise socket.error, msg
 
     def close(self):
         """Close the connection to the HTTP server."""