summaryrefslogtreecommitdiff
path: root/src/os/unix/ngx_process.c
diff options
context:
space:
mode:
authornginx <nginx@nginx.org>2012-10-30 14:08:26 +0000
committerJon Kolb <jon@b0g.us>2012-10-30 14:08:26 +0000
commit31b9b10de5546f4ecb9dd3791c2a32dc97a34651 (patch)
treed723bf761713812cac9b52fac9cb7bd280c05212 /src/os/unix/ngx_process.c
parentab4bd1d23e43e937e2b9f08ae34904f9d0d7c60b (diff)
downloadnginx-31b9b10de5546f4ecb9dd3791c2a32dc97a34651.tar.gz
Changes with nginx 1.3.8 30 Oct 2012v1.3.8
*) Feature: the "optional_no_ca" parameter of the "ssl_verify_client" directive. Thanks to Mike Kazantsev and Eric O'Connor. *) Feature: the $bytes_sent, $connection, and $connection_requests variables can now be used not only in the "log_format" directive. Thanks to Benjamin Grössing. *) Feature: the "auto" parameter of the "worker_processes" directive. *) Bugfix: "cache file ... has md5 collision" alert. *) Bugfix: in the ngx_http_gunzip_filter_module. *) Bugfix: in the "ssl_stapling" directive.
Diffstat (limited to 'src/os/unix/ngx_process.c')
-rw-r--r--src/os/unix/ngx_process.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/os/unix/ngx_process.c b/src/os/unix/ngx_process.c
index 5713ca8e1..4ef3582e8 100644
--- a/src/os/unix/ngx_process.c
+++ b/src/os/unix/ngx_process.c
@@ -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;