aboutsummaryrefslogtreecommitdiff
path: root/src/core/nginx.c
diff options
context:
space:
mode:
authorRuslan Ermilov <ru@nginx.com>2020-06-01 20:19:27 +0300
committerRuslan Ermilov <ru@nginx.com>2020-06-01 20:19:27 +0300
commitda370de9904e00f48e59e92f8bff29d5fe6a3ff2 (patch)
treef9d25115e21c27fe81d90679cfa8f844018d00e1 /src/core/nginx.c
parent59a0ceb9947df7a082a239808a0dd56b5c8ceda6 (diff)
downloadnginx-da370de9904e00f48e59e92f8bff29d5fe6a3ff2.tar.gz
nginx-da370de9904e00f48e59e92f8bff29d5fe6a3ff2.zip
Fixed removing of listening UNIX sockets when "changing binary".
When changing binary, sending a SIGTERM to the new binary's master process should not remove inherited UNIX sockets unless the old binary's master process has exited.
Diffstat (limited to 'src/core/nginx.c')
-rw-r--r--src/core/nginx.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/core/nginx.c b/src/core/nginx.c
index 9fcb0eb23..f73e5598e 100644
--- a/src/core/nginx.c
+++ b/src/core/nginx.c
@@ -492,6 +492,7 @@ ngx_add_inherited_sockets(ngx_cycle_t *cycle)
ngx_memzero(ls, sizeof(ngx_listening_t));
ls->fd = (ngx_socket_t) s;
+ ls->inherited = 1;
}
}