diff options
| author | Sergey Kandaurov <pluknet@nginx.com> | 2022-12-15 19:40:44 +0400 |
|---|---|---|
| committer | Sergey Kandaurov <pluknet@nginx.com> | 2022-12-15 19:40:44 +0400 |
| commit | a1bb12e14ee86fdac2877c3a834b604f5bc522ae (patch) | |
| tree | dae9169a2741a019c4840d8d5ab578bc78d30786 /src/event/ngx_event.c | |
| parent | 36f7b31f9578c0d393cfe82d4e23c76a7539f34e (diff) | |
| parent | 8e9f7e89b819702532803f10f728b070f8ee2617 (diff) | |
| download | nginx-a1bb12e14ee86fdac2877c3a834b604f5bc522ae.tar.gz nginx-a1bb12e14ee86fdac2877c3a834b604f5bc522ae.tar.bz2 | |
Merged with the default branch.
Diffstat (limited to 'src/event/ngx_event.c')
| -rw-r--r-- | src/event/ngx_event.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c index 284aafbe6..5a7559777 100644 --- a/src/event/ngx_event.c +++ b/src/event/ngx_event.c @@ -434,6 +434,7 @@ ngx_event_init_conf(ngx_cycle_t *cycle, void *conf) { #if (NGX_HAVE_REUSEPORT) ngx_uint_t i; + ngx_core_conf_t *ccf; ngx_listening_t *ls; #endif @@ -460,7 +461,9 @@ ngx_event_init_conf(ngx_cycle_t *cycle, void *conf) #if (NGX_HAVE_REUSEPORT) - if (!ngx_test_config) { + ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module); + + if (!ngx_test_config && ccf->master) { ls = cycle->listening.elts; for (i = 0; i < cycle->listening.nelts; i++) { @@ -828,7 +831,9 @@ ngx_event_process_init(ngx_cycle_t *cycle) rev->deferred_accept = ls[i].deferred_accept; #endif - if (!(ngx_event_flags & NGX_USE_IOCP_EVENT)) { + if (!(ngx_event_flags & NGX_USE_IOCP_EVENT) + && cycle->old_cycle) + { if (ls[i].previous) { /* |