]> git.kaiwu.me - nginx.git/commitdiff
Removed conditional compilation from waitpid() error test.
authorMaxim Dounin <mdounin@mdounin.ru>
Thu, 18 Oct 2012 14:48:33 +0000 (14:48 +0000)
committerMaxim Dounin <mdounin@mdounin.ru>
Thu, 18 Oct 2012 14:48:33 +0000 (14:48 +0000)
There are reports that call to a signal handler for an exited process
despite waitpid() already called for the process may happen on Linux
as well.

src/os/unix/ngx_process.c

index 5713ca8e1b38325eab3f3835ead4068c3e2fbb9d..4ef3582e8a2b1b050fcb071c607e6fe194c8b174 100644 (file)
@@ -474,8 +474,6 @@ ngx_process_get_status(void)
                 return;
             }
 
-#if (NGX_SOLARIS || NGX_FREEBSD)
-
             /*
              * Solaris always calls the signal handler for each exited process
              * despite waitpid() may be already called for this process.
@@ -491,8 +489,6 @@ ngx_process_get_status(void)
                 return;
             }
 
-#endif
-
             ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, err,
                           "waitpid() failed");
             return;