merged requestCloseOnExec fixes to listening sockets

ZServer/FCGIServer.py

@@ -707,6 +707,9 @@ class FCGIServer(asyncore.dispatcher):
     def writable (self):
         return 0
 
+    def create_socket(self, family, type):
+        asyncore.dispatcher.create_socket(self, family, type)
+        requestCloseOnExec(self.socket)
 
     def listen(self, num):
         # override asyncore limits for nt's listen queue size

ZServer/FTPServer.py

@@ -658,7 +658,11 @@ class FTPServer(ftp_server):
     def log_info(self, message, type='info'):
         if self.shutup: return
         asyncore.dispatcher.log_info(self, message, type)
-        
+
+    def create_socket(self, family, type):
+        asyncore.dispatcher.create_socket(self, family, type)
+        requestCloseOnExec(self.socket)
+
     def handle_accept (self):
         conn, addr = self.accept()
         self.total_sessions.increment()

ZServer/HTTPServer.py

@@ -401,6 +401,10 @@ class zhttp_server(http_server):
         if self.shutup: return
         dispatcher.log_info(self, message, type)
 
+    def create_socket(self, family, type):
+        dispatcher.create_socket(self, family, type)
+        requestCloseOnExec(self.socket)
+
     def readable(self):
         return self.accepting and \
                 len(asyncore.socket_map) < CONNECTION_LIMIT

ZServer/PCGIServer.py

@@ -343,6 +343,9 @@ class PCGIServer(asyncore.dispatcher):
                 )
         self.listen(256)
 
+    def create_socket(self, family, type):
+        asyncore.dispatcher.create_socket(self, family, type)
+        requestCloseOnExec(self.socket)
 
     def read_info(self,info_file):
         "read configuration information from a PCGI info file"

lib/python/ZServer/FCGIServer.py

@@ -707,6 +707,9 @@ class FCGIServer(asyncore.dispatcher):
     def writable (self):
         return 0
 
+    def create_socket(self, family, type):
+        asyncore.dispatcher.create_socket(self, family, type)
+        requestCloseOnExec(self.socket)
 
     def listen(self, num):
         # override asyncore limits for nt's listen queue size

lib/python/ZServer/FTPServer.py

@@ -658,7 +658,11 @@ class FTPServer(ftp_server):
     def log_info(self, message, type='info'):
         if self.shutup: return
         asyncore.dispatcher.log_info(self, message, type)
-        
+
+    def create_socket(self, family, type):
+        asyncore.dispatcher.create_socket(self, family, type)
+        requestCloseOnExec(self.socket)
+
     def handle_accept (self):
         conn, addr = self.accept()
         self.total_sessions.increment()

lib/python/ZServer/HTTPServer.py

@@ -401,6 +401,10 @@ class zhttp_server(http_server):
         if self.shutup: return
         dispatcher.log_info(self, message, type)
 
+    def create_socket(self, family, type):
+        dispatcher.create_socket(self, family, type)
+        requestCloseOnExec(self.socket)
+
     def readable(self):
         return self.accepting and \
                 len(asyncore.socket_map) < CONNECTION_LIMIT

lib/python/ZServer/PCGIServer.py

@@ -343,6 +343,9 @@ class PCGIServer(asyncore.dispatcher):
                 )
         self.listen(256)
 
+    def create_socket(self, family, type):
+        asyncore.dispatcher.create_socket(self, family, type)
+        requestCloseOnExec(self.socket)
 
     def read_info(self,info_file):
         "read configuration information from a PCGI info file"