Mercurial > hg > nginx

diff src/core/ngx_connection.c @ 8468:001ec7fce567 quic

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged with the default branch.
author Sergey Kandaurov <pluknet@nginx.com>
date Mon, 13 Jul 2020 15:34:22 +0300
parents db8fe75c9c7a 9c038f5e0464
children 0d2b2664b41c
line wrap: on
line diff
--- a/src/core/ngx_connection.c
+++ b/src/core/ngx_connection.c
@@ -1074,7 +1074,8 @@ ngx_close_listening_sockets(ngx_cycle_t 
 
         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;