Changeset 1666

Timestamp:

06/16/07 16:58:53

Author:

fumanchu

Message:

Upgraded all INADDR_ANY and localhost checks to include IPv6 equivalents.

Files:

• trunk/cherrypy/_cpserver.py (modified) (7 diffs)
• trunk/cherrypy/test/helper.py (modified) (1 diff)
• trunk/cherrypy/test/test_core.py (modified) (1 diff)
• trunk/cherrypy/test/test_proxy.py (modified) (1 diff)
• trunk/cherrypy/test/test_xmlrpc.py (modified) (1 diff)
• trunk/cherrypy/test/webtest.py (modified) (2 diffs)
• trunk/cherrypy/wsgiserver/__init__.py (modified) (2 diffs)

trunk/cherrypy/_cpserver.py

@@ -7 +7 @@
-import cherrypy
-from cherrypy.lib import attributes
+
+
+def client_host(server_host):
+    """Return the host on which a client can connect to the given listener."""
+    if server_host == '0.0.0.0':
+        # 0.0.0.0 is INADDR_ANY, which should answer on localhost.
+        return '127.0.0.1'
+    if server_host == '::':
+        # :: is IN6ADDR_ANY, which should answer on localhost.
+        return '::1'
+    return server_host
-
-
@@ -55 +66 @@
-        doc="""The hostname or IP address on which to listen for connections.
-        
-
-
-
-
+
+
+
+
+
+
-    
-    socket_file = ''
@@ -173 +186 @@
-            if isinstance(bind_addr, tuple):
-                host, port = bind_addr
-                if host == '0.0.0.0':
-                    # 0.0.0.0 is INADDR_ANY, which should answer on localhost.
-                    host = 'localhost'
-                wait_for_occupied_port(host, port)
-    
@@ -203 +213 @@
-        
-        host = self.socket_host
-
-
-
+
+
+
+
-            host = socket.gethostname()
-        
@@ -226 +237 @@
-    if not host:
-        raise ValueError("Host values of '' or None are not allowed.")
-
-
-
+
-    port = int(port)
-    
@@ -256 +265 @@
-    if not host:
-        raise ValueError("Host values of '' or None are not allowed.")
-    if host == '0.0.0.0':
-        # 0.0.0.0 is INADDR_ANY, which should answer on localhost.
-        host = 'localhost'
-    
-    for trial in xrange(50):
@@ -277 +283 @@
-    if not host:
-        raise ValueError("Host values of '' or None are not allowed.")
-    if host == '0.0.0.0':
-        # 0.0.0.0 is INADDR_ANY, which should answer on localhost.
-        host = 'localhost'
-    
-    for trial in xrange(50):

trunk/cherrypy/test/helper.py

@@ -43 +43 @@
-            port = ":%s" % self.PORT
-        
-
-
-
-
-
-
-
+
-                                self.script_name.rstrip("/"))
-    

trunk/cherrypy/test/test_core.py

@@ -487 +487 @@
-            # INADDR_ANY, which should respond on localhost.
-            host = "127.0.0.1"
+        if host == '::':
+            # IN6ADDR_ANY, which should respond on localhost.
+            host = "::1"
-        intro = '%s - - [' % host
-        

trunk/cherrypy/test/test_proxy.py

@@ -92 +92 @@
-                port = ":%s" % self.PORT
-            host = self.HOST
-== '0.0.0.0'
+in ('0.0.0.0', '::')
-                import socket
-                host = socket.gethostname()

trunk/cherrypy/test/test_xmlrpc.py

@@ -116 +116 @@
-            # INADDR_ANY, which should respond on localhost.
-            host = "127.0.0.1"
+        if host == '::':
+            # IN6ADDR_ANY, which should respond on localhost.
+            host = "::1"
-        
-        if scheme == "https":

trunk/cherrypy/test/webtest.py

@@ -168 +168 @@
-                # INADDR_ANY, which should respond on localhost.
-                host = "127.0.0.1"
+            elif host == '::':
+                # IN6ADDR_ANY, which should respond on localhost.
+                host = "::1"
-            self.HTTP_CONN = cls(host, self.PORT)
-            # Automatically re-connect?
@@ -473 +476 @@
-                    # INADDR_ANY, which should respond on localhost.
-                    host = "127.0.0.1"
+                elif host == '::':
+                    # IN6ADDR_ANY, which should respond on localhost.
+                    host = "::1"
-                conn = http_conn(host, port)
-            

trunk/cherrypy/wsgiserver/__init__.py

@@ -731 +731 @@
-    
-    bind_addr: The interface on which to listen for connections.
-
-
-
-
-
+
+
+
+
+
+
+
-        For UNIX sockets, supply the filename as a string.
-    wsgi_app: the WSGI 'application callable'; multiple WSGI applications
@@ -818 +820 @@
-            # '0.0.0.0', we deny both the empty string and None as values.
-            raise ValueError("Host values of '' or None are not allowed. "
-instead to listen on all active
-interfaces (INADDR_ANY)
+(IPv4) or '::' (IPv6) instead
+to listen on all active interfaces
-        self._bind_addr = value
-    bind_addr = property(_get_bind_addr, _set_bind_addr,
-        doc="""The interface on which to listen for connections.
-        
-
-
-
-
-
+
+
+
+
+
+
-        
-        For UNIX sockets, supply the filename as a string.""")