From: Sergey Kandaurov Date: Thu, 15 Dec 2022 15:40:44 +0000 (+0400) Subject: Merged with the default branch. X-Git-Tag: release-1.25.0~4^2~49 X-Git-Url: http://www.kaiwu.me/postgresql/commit/static/gitweb.js?a=commitdiff_plain;h=a1bb12e14ee86fdac2877c3a834b604f5bc522ae;p=nginx.git Merged with the default branch. --- a1bb12e14ee86fdac2877c3a834b604f5bc522ae diff --cc src/http/ngx_http_core_module.c index 248fa80ea,2647e7cd0..e988a4ca7 --- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@@ -4303,13 -4288,17 +4303,23 @@@ ngx_http_core_listen(ngx_conf_t *cf, ng return NGX_CONF_ERROR; } +#if (NGX_HTTP_SSL && NGX_HTTP_V3) + if (lsopt.ssl && lsopt.http3) { + return "\"ssl\" parameter is incompatible with \"http3\""; + } +#endif + for (n = 0; n < u.naddrs; n++) { + + for (i = 0; i < n; i++) { + if (ngx_cmp_sockaddr(u.addrs[n].sockaddr, u.addrs[n].socklen, + u.addrs[i].sockaddr, u.addrs[i].socklen, 0) + == NGX_OK) + { + goto next; + } + } + lsopt.sockaddr = u.addrs[n].sockaddr; lsopt.socklen = u.addrs[n].socklen; lsopt.addr_text = u.addrs[n].name;