nginx: 6bfae7032017

changeset 4361:6bfae7032017 stable-1.0

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.

author Maxim Dounin <mdounin@mdounin.ru>

date Wed, 14 Dec 2011 15:25:32 +0000

parents 7447784028a7

children 8e7bb000ba4a

files src/core/nginx.c

diffstat

1 files changed, 4 insertions(+), 0 deletions(-) [+]

line wrap: on

line diff

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