From 408c3315455ce5a32e3e4501513cda07145f1142 Mon Sep 17 00:00:00 2001
From: Maxim Dounin <mdounin@mdounin.ru>
Date: Wed, 14 Dec 2011 15:25:32 +0000
Subject: 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.
---
 src/core/nginx.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/core')

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