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.
This commit is contained in:
Maxim Dounin 2011-12-14 15:25:32 +00:00
parent f73a105e40
commit eb797a1658
1 changed files with 4 additions and 0 deletions

View File

@ -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) {