diff options
| author | Sergey Kandaurov <pluknet@nginx.com> | 2020-07-13 15:34:22 +0300 |
|---|---|---|
| committer | Sergey Kandaurov <pluknet@nginx.com> | 2020-07-13 15:34:22 +0300 |
| commit | 2346ee29e1333c20b9a9f9e5ea73940237fbff02 (patch) | |
| tree | 9f7249e4871fe9a13799df5e16abbaa2ebd065ff /src/core/ngx_connection.c | |
| parent | 3db00b4da74ddc0872be4cdb836aaff7fc21272a (diff) | |
| parent | 1b2f040a1f82dfd3b30d3b67ea57b3bf1d723d4d (diff) | |
| download | nginx-2346ee29e1333c20b9a9f9e5ea73940237fbff02.tar.gz nginx-2346ee29e1333c20b9a9f9e5ea73940237fbff02.zip | |
Merged with the default branch.
Diffstat (limited to 'src/core/ngx_connection.c')
| -rw-r--r-- | src/core/ngx_connection.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c index 5bae54502..ba07c63e8 100644 --- a/src/core/ngx_connection.c +++ b/src/core/ngx_connection.c @@ -1074,7 +1074,8 @@ ngx_close_listening_sockets(ngx_cycle_t *cycle) if (ls[i].sockaddr->sa_family == AF_UNIX && ngx_process <= NGX_PROCESS_MASTER - && ngx_new_binary == 0) + && ngx_new_binary == 0 + && (!ls[i].inherited || ngx_getppid() != ngx_parent)) { u_char *name = ls[i].addr_text.data + sizeof("unix:") - 1; |