]> git.kaiwu.me - nginx.git/commitdiff
Fixed handling of SIGWINCH/NOACCEPT signal.
authorMaxim Dounin <mdounin@mdounin.ru>
Tue, 15 Nov 2011 20:35:41 +0000 (20:35 +0000)
committerMaxim Dounin <mdounin@mdounin.ru>
Tue, 15 Nov 2011 20:35:41 +0000 (20:35 +0000)
After first upgrade it was ignored since r4020 (1.1.1, 1.0.9) as
ngx_daemonized wasn't set.

src/core/nginx.c

index 9e00a2d86acc92d7d5ac8a04b3f35d2f1d4ea12d..5de48351ac3106abf70f9740f5b6fa8a3cf17bcc 100644 (file)
@@ -374,6 +374,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) {