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.

diff --git a/src/core/nginx.c b/src/core/nginx.c
index 47a00e19b727803951b10fb0ac87757ebb427baa..66093f174a017d4c25b5e62374abceac58f3230e 100644 (file)
--- 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) {