From: Guido van Rossum <guido@python.org>
Date: Wed, 28 Jul 1999 21:39:28 +0000 (+0000)
Subject: Another patch from Andy Dustman:
X-Git-Tag: v1.6a1~1061
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ab455a8fa946cb8d599018c2f861f1fe909c545;p=thirdparty%2FPython%2Fcpython.git

Another patch from Andy Dustman:

"""
Here's a patch for the ForkingMixIn which will prevent the server from
forking itself into the ground. Note: I've tested a very similar patch
(subclassed ForkingMixIn) but not actually tested this one. As you might
surmise, this was done out of necessity...

If the maximum number of children are already running, block while waiting
for a child to exit.
"""

(I added that last sentence as a comment to the code --GvR.)
---

diff --git a/Lib/SocketServer.py b/Lib/SocketServer.py
index 82bc8fb7a284..f7da84f5575a 100644
--- a/Lib/SocketServer.py
+++ b/Lib/SocketServer.py
@@ -281,12 +281,19 @@ class ForkingMixIn:
     """Mix-in class to handle each request in a new process."""
 
     active_children = None
+    max_children = 40
 
     def collect_children(self):
         """Internal routine to wait for died children."""
         while self.active_children:
+            if len(self.active_children) < self.max_children:
+                options = os.WNOHANG
+            else:
+                # If the maximum number of children are already
+                # running, block while waiting for a child to exit
+                options = 0
             try:
-                pid, status = os.waitpid(0, os.WNOHANG)
+                pid, status = os.waitpid(0, options)
             except os.error:
                 pid = None
             if not pid: break