Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nginx/nginx.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMaxim Dounin <mdounin@mdounin.ru>2011-11-16 00:35:41 +0400
committerMaxim Dounin <mdounin@mdounin.ru>2011-11-16 00:35:41 +0400
commit2b24a67268b55c27f4577f5c7328233ba82025ee (patch)
treeaa42492b0f385d4f4ea90c109627e43d038ce744 /src
parent2fd9b49334d42f4c79edd06a7506ec719f291317 (diff)
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.
Diffstat (limited to 'src')
-rw-r--r--src/core/nginx.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/core/nginx.c b/src/core/nginx.c
index 9e00a2d86..5de48351a 100644
--- a/src/core/nginx.c
+++ b/src/core/nginx.c
@@ -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) {