Changeset 2038

Timestamp:

09/27/08 13:51:56

Author:

fumanchu

Message:

Fix for #856 (Prevent open sockets from being inherited by child processes). Thanks to Nicolas Grilly for the ticket and patch.

Files:

• trunk/cherrypy/wsgiserver/__init__.py (modified) (3 diffs)

trunk/cherrypy/wsgiserver/__init__.py

@@ -1204 +1204 @@
-
-
+try:
+    import fcntl
+except ImportError:
+    try:
+        from ctypes import windll, WinError
+    except ImportError:
+        def prevent_socket_inheritance(sock):
+            """Dummy function, since neither fcntl nor ctypes are available."""
+            pass
+    else:
+        def prevent_socket_inheritance(sock):
+            """Mark the given socket fd as non-inheritable (Windows)."""
+            if not windll.kernel32.SetHandleInformation(sock.fileno(), 1, 0):
+                raise WinError()
+else:
+    def prevent_socket_inheritance(sock):
+        """Mark the given socket fd as non-inheritable (POSIX)."""
+        fd = sock.fileno()
+        old_flags = fcntl.fcntl(fd, fcntl.F_GETFD)
+        fcntl.fcntl(fd, fcntl.F_SETFD, old_flags | fcntl.FD_CLOEXEC)
+
-
-class CherryPyWSGIServer(object):
@@ -1397 +1418 @@
-        """Create (or recreate) the actual socket object."""
-        self.socket = socket.socket(family, type, proto)
+        prevent_socket_inheritance(self.socket)
-        self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-        if self.nodelay:
@@ -1416 +1438 @@
-        try:
-            s, addr = self.socket.accept()
+            prevent_socket_inheritance(s)
-            if not self.ready:
-                return