In collect_children(), put a try-except around os.waitpid() because it

may raise an exception (when there are no children).  Reported by
Andy Dustman.

diff --git a/Lib/SocketServer.py b/Lib/SocketServer.py
index 1ede68d52660604352dc43d7c4f7cc960d874105..82bc8fb7a28479bb1ec8fa7ddc6da19f21a6f8bb 100644 (file)
--- a/Lib/SocketServer.py
+++ b/Lib/SocketServer.py
@@ -285,7 +285,10 @@ class ForkingMixIn:
     def collect_children(self):
         """Internal routine to wait for died children."""
         while self.active_children:
-            pid, status = os.waitpid(0, os.WNOHANG)
+            try:
+                pid, status = os.waitpid(0, os.WNOHANG)
+            except os.error:
+                pid = None
             if not pid: break
             self.active_children.remove(pid)