diff options
author | Ruslan Ermilov <ru@nginx.com> | 2020-06-01 20:19:27 +0300 |
---|---|---|
committer | Ruslan Ermilov <ru@nginx.com> | 2020-06-01 20:19:27 +0300 |
commit | da370de9904e00f48e59e92f8bff29d5fe6a3ff2 (patch) | |
tree | f9d25115e21c27fe81d90679cfa8f844018d00e1 /src/core/ngx_cycle.c | |
parent | 59a0ceb9947df7a082a239808a0dd56b5c8ceda6 (diff) | |
download | nginx-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/ngx_cycle.c')
-rw-r--r-- | src/core/ngx_cycle.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c index 95f4bdfab..764cf46ba 100644 --- a/src/core/ngx_cycle.c +++ b/src/core/ngx_cycle.c @@ -520,6 +520,7 @@ ngx_init_cycle(ngx_cycle_t *old_cycle) == NGX_OK) { nls[n].fd = ls[i].fd; + nls[n].inherited = ls[i].inherited; nls[n].previous = &ls[i]; ls[i].remain = 1; |