comparison src/core/nginx.c @ 8468:001ec7fce567 quic

Merged with the default branch.
author Sergey Kandaurov <pluknet@nginx.com>
date Mon, 13 Jul 2020 15:34:22 +0300
parents 9c038f5e0464
children f18db38a9826
comparison
equal deleted inserted replaced
8467:e02250b55b17 8468:001ec7fce567
490 } 490 }
491 491
492 ngx_memzero(ls, sizeof(ngx_listening_t)); 492 ngx_memzero(ls, sizeof(ngx_listening_t));
493 493
494 ls->fd = (ngx_socket_t) s; 494 ls->fd = (ngx_socket_t) s;
495 ls->inherited = 1;
495 } 496 }
496 } 497 }
497 498
498 if (v != p) { 499 if (v != p) {
499 ngx_log_error(NGX_LOG_EMERG, cycle->log, 0, 500 ngx_log_error(NGX_LOG_EMERG, cycle->log, 0,