Merge commit 'bff3c373b32ebf707085e3c677bfad19b44fa054'

2013-11-27 13:34:17 +01:00 · 2013-11-27 13:34:17 +01:00 · 063c7de783
parent 08d37e0deb bff3c373b3
commit 063c7de783
1 changed files with 1 additions and 3 deletions
--- a/websockify/websocket.py
+++ b/websockify/websocket.py
@ -833,9 +833,7 @@ class WebSocketServer(object):

        # Allow override of SIGINT
        signal.signal(signal.SIGINT, self.do_SIGINT)
-        if not multiprocessing:
-            # os.fork() (python 2.4) child reaper
-            signal.signal(signal.SIGCHLD, self.fallback_SIGCHLD)
+        signal.signal(signal.SIGCHLD, self.fallback_SIGCHLD)

        last_active_time = self.launch_time
        while True: