diff options
| author | Pádraig Brady <P@draigBrady.com> | 2012-11-12 15:17:26 (GMT) |
|---|---|---|
| committer | Pádraig Brady <P@draigBrady.com> | 2012-11-12 15:17:26 (GMT) |
| commit | 22aee3ca73f9872b4aa8f5e65bc2c4feba87146d (patch) | |
| tree | 98ea6b8fb0e5497a0d2c2e3c451737a7a7def642 | |
| parent | ee3c798c9703677f5676420560a2d46f1512c27b (diff) | |
| parent | 97234c613cbbbeecf2157e02b5fb72cc4ff735cc (diff) | |
| download | python-eventlet-22aee3ca73f9872b4aa8f5e65bc2c4feba87146d.zip python-eventlet-22aee3ca73f9872b4aa8f5e65bc2c4feba87146d.tar.gz python-eventlet-22aee3ca73f9872b4aa8f5e65bc2c4feba87146d.tar.bz2 | |
Merge branch 'master' into el6el6
| -rw-r--r-- | waitpid_zombies.patch | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/waitpid_zombies.patch b/waitpid_zombies.patch new file mode 100644 index 0000000..99aaf80 --- /dev/null +++ b/waitpid_zombies.patch @@ -0,0 +1,19 @@ +# HG changeset patch +# User Vishvananda Ishaya <vishvananda@gmail.com> +# Date 1352422051 28800 +# Node ID 2e0b34668e60f5ff6b85db39c294e782a2597738 +# Parent 5580e67331c02c407c56f9cdc93c524b82665738 +fix waitpid returning (0, 0) + +diff -r 5580e67331c02c407c56f9cdc93c524b82665738 -r 2e0b34668e60f5ff6b85db39c294e782a2597738 eventlet/green/os.py +--- a/eventlet/green/os.py Fri Nov 02 15:16:15 2012 -0600 ++++ b/eventlet/green/os.py Thu Nov 08 16:47:31 2012 -0800 +@@ -77,7 +77,7 @@ + new_options = options | os_orig.WNOHANG + while True: + rpid, status = __original_waitpid__(pid, new_options) +- if status >= 0: ++ if rpid and status >= 0: + return rpid, status + greenthread.sleep(0.01) + |