diff options
| author |   robert <robert@openbsd.org> | 2011-11-12 11:09:00 +0000 |
|---|---|---|
| committer | robert <robert@openbsd.org> | 2011-11-12 11:09:00 +0000 |
| commit | e5f444907f27ebace3451e2b67ee6f223ce9957e (patch) | |
| tree | f76a10b73d18d4116de1ca34902bec6f6b1bd328 /usr.sbin/nginx/src/os/unix/ngx_process.c | |
| parent | update currency exchange rates; (diff) | |
| download | wireguard-openbsd-e5f444907f27ebace3451e2b67ee6f223ce9957e.tar.xz wireguard-openbsd-e5f444907f27ebace3451e2b67ee6f223ce9957e.zip | |
update to 1.0.9
Diffstat (limited to 'usr.sbin/nginx/src/os/unix/ngx_process.c')
| -rw-r--r-- | usr.sbin/nginx/src/os/unix/ngx_process.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/usr.sbin/nginx/src/os/unix/ngx_process.c b/usr.sbin/nginx/src/os/unix/ngx_process.c index 605558786f2..08069c4b698 100644 --- a/usr.sbin/nginx/src/os/unix/ngx_process.c +++ b/usr.sbin/nginx/src/os/unix/ngx_process.c @@ -339,8 +339,10 @@ ngx_signal_handler(int signo) break; case ngx_signal_value(NGX_NOACCEPT_SIGNAL): - ngx_noaccept = 1; - action = ", stop accepting connections"; + if (ngx_daemonized) { + ngx_noaccept = 1; + action = ", stop accepting connections"; + } break; case ngx_signal_value(NGX_RECONFIGURE_SIGNAL): @@ -392,6 +394,9 @@ ngx_signal_handler(int signo) switch (signo) { case ngx_signal_value(NGX_NOACCEPT_SIGNAL): + if (!ngx_daemonized) { + break; + } ngx_debug_quit = 1; case ngx_signal_value(NGX_SHUTDOWN_SIGNAL): ngx_quit = 1; @@ -536,7 +541,7 @@ ngx_process_get_status(void) if (WEXITSTATUS(status) == 2 && ngx_processes[i].respawn) { ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0, "%s %P exited with fatal code %d " - "and can not be respawn", + "and cannot be respawned", process, pid, WEXITSTATUS(status)); ngx_processes[i].respawn = 0; } |