Ticket #871: v6only.diff

cherrypy/wsgiserver/__init__.py

@@ -1434 +1434 @@
-            ctx.use_certificate_file(self.ssl_certificate)
-            self.socket = SSLConnection(ctx, self.socket)
-            self.populate_ssl_environ()
+        if hasattr(socket, "IPV6_V6ONLY") and \
+           family == socket.AF_INET6 and \
+           self.bind_addr[0] == '::':
+            # If the app is listening on the V6 any address,
+            # activate dual-stack.
+            try:
+                self.socket.setsockopt(socket.IPPROTO_IPV6, socket.IPV6_V6ONLY, 0)
+            except socket.error:
+                # Apparently, the socket option is not available in
+                # this machine's TCP stack
+                pass
-        self.socket.bind(self.bind_addr)
-    
-    def tick(self):