diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2011-12-14 15:25:32 +0000 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2011-12-14 15:25:32 +0000 |
| commit | 408c3315455ce5a32e3e4501513cda07145f1142 (patch) | |
| tree | 40fd480b49850a527ad507c86e53e5ca482a6904 /src/core/nginx.c | |
| parent | e44e248c23b49d3037a4add578fa1778be6be315 (diff) | |
| download | nginx-408c3315455ce5a32e3e4501513cda07145f1142.tar.gz nginx-408c3315455ce5a32e3e4501513cda07145f1142.tar.bz2 | |
Merge of r4294:
Fixed handling of SIGWINCH/NOACCEPT signal.
After first upgrade it was ignored since r4020 (1.1.1, 1.0.9) as
ngx_daemonized wasn't set.
Diffstat (limited to 'src/core/nginx.c')
| -rw-r--r-- | src/core/nginx.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/core/nginx.c b/src/core/nginx.c index 47a00e19b..66093f174 100644 --- a/src/core/nginx.c +++ b/src/core/nginx.c @@ -376,6 +376,10 @@ main(int argc, char *const *argv) ngx_daemonized = 1; } + if (ngx_inherited) { + ngx_daemonized = 1; + } + #endif if (ngx_create_pidfile(&ccf->pid, cycle->log) != NGX_OK) { |