diff options
author | Igor Sysoev <igor@sysoev.ru> | 2004-10-11 19:07:03 +0400 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2004-10-11 19:07:03 +0400 |
commit | 924bd79e317e9a137c0d1b9d349185758a628ec4 (patch) | |
tree | f877c8b19e53e7d0a7683e3dd9aeb713146c4a8f /src/os/unix/ngx_process.c | |
parent | aef13d7f6660f4f8d2c50c95b8e182e62c115f88 (diff) |
nginx-0.1.1-RELEASE importrelease-0.1.1
*) Feature: the gzip_types directive.
*) Feature: the tcp_nodelay directive.
*) Feature: the send_lowat directive is working not only on OSes that
support kqueue NOTE_LOWAT, but also on OSes that support SO_SNDLOWAT.
*) Feature: the setproctitle() emulation for Linux and Solaris.
*) Bugfix: the "Location" header rewrite bug fixed while the proxying.
*) Bugfix: the ngx_http_chunked_module module may get caught in an
endless loop.
*) Bugfix: the /dev/poll module bugs fixed.
*) Bugfix: the responses were corrupted when the temporary files were
used while the proxying.
*) Bugfix: the unescaped requests were passed to the backend.
*) Bugfix: while the build configuration on Linux 2.4 the
--with-poll_module parameter was required.
Diffstat (limited to 'src/os/unix/ngx_process.c')
-rw-r--r-- | src/os/unix/ngx_process.c | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/src/os/unix/ngx_process.c b/src/os/unix/ngx_process.c index dba949c7d..aff242c19 100644 --- a/src/os/unix/ngx_process.c +++ b/src/os/unix/ngx_process.c @@ -12,10 +12,15 @@ static void ngx_execute_proc(ngx_cycle_t *cycle, void *data); -ngx_int_t ngx_process_slot; -ngx_socket_t ngx_channel; -ngx_int_t ngx_last_process; -ngx_process_t ngx_processes[NGX_MAX_PROCESSES]; + +int ngx_argc; +char **ngx_argv; +char **ngx_os_argv; + +ngx_int_t ngx_process_slot; +ngx_socket_t ngx_channel; +ngx_int_t ngx_last_process; +ngx_process_t ngx_processes[NGX_MAX_PROCESSES]; ngx_pid_t ngx_spawn_process(ngx_cycle_t *cycle, @@ -231,8 +236,23 @@ void ngx_process_get_status() return; } +#if (SOLARIS) + + /* + * Solaris always calls the signal handler for each exited process + * despite waitpid() may be already called for this process + */ + + if (err == NGX_ECHILD) { + ngx_log_error(NGX_LOG_INFO, ngx_cycle->log, errno, + "waitpid() failed"); + } + +#endif + ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, errno, "waitpid() failed"); + return; } |