Patch #744041: Use only first two elements of address to support IPv6.

diff --git a/Lib/BaseHTTPServer.py b/Lib/BaseHTTPServer.py
index 195d54a3be173abdddab23f2e982fb31dbb1daf9..7cc7b9e5d2b6857d02f839f17482386ea0a501cc 100644 (file)
--- a/Lib/BaseHTTPServer.py
+++ b/Lib/BaseHTTPServer.py
@@ -98,7 +98,7 @@ class HTTPServer(SocketServer.TCPServer):
     def server_bind(self):
         """Override server_bind to store the server name."""
         SocketServer.TCPServer.server_bind(self)
-        host, port = self.socket.getsockname()
+        host, port = self.socket.getsockname()[:2]
         self.server_name = socket.getfqdn(host)
         self.server_port = port
 
@@ -475,7 +475,7 @@ class BaseHTTPRequestHandler(SocketServer.StreamRequestHandler):
 
         """
 
-        host, port = self.client_address
+        host, port = self.client_address[:2]
         return socket.getfqdn(host)
 
     # Essentially static class variables