aboutsummaryrefslogtreecommitdiff
path: root/src/core/nginx.c
diff options
context:
space:
mode:
authorSergey Kandaurov <pluknet@nginx.com>2020-07-13 15:34:22 +0300
committerSergey Kandaurov <pluknet@nginx.com>2020-07-13 15:34:22 +0300
commit2346ee29e1333c20b9a9f9e5ea73940237fbff02 (patch)
tree9f7249e4871fe9a13799df5e16abbaa2ebd065ff /src/core/nginx.c
parent3db00b4da74ddc0872be4cdb836aaff7fc21272a (diff)
parent1b2f040a1f82dfd3b30d3b67ea57b3bf1d723d4d (diff)
downloadnginx-2346ee29e1333c20b9a9f9e5ea73940237fbff02.tar.gz
nginx-2346ee29e1333c20b9a9f9e5ea73940237fbff02.zip
Merged with the default branch.
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;
}
}