]> git.kaiwu.me - nginx.git/commitdiff
Merged with the default branch.
authorSergey Kandaurov <pluknet@nginx.com>
Thu, 15 Dec 2022 15:40:44 +0000 (19:40 +0400)
committerSergey Kandaurov <pluknet@nginx.com>
Thu, 15 Dec 2022 15:40:44 +0000 (19:40 +0400)
1  2 
src/event/ngx_event.c
src/event/ngx_event_openssl.c
src/http/ngx_http_core_module.c
src/stream/ngx_stream_core_module.c
src/stream/ngx_stream_proxy_module.c

Simple merge
Simple merge
index 248fa80eac45ca8b60783549cc09d6090ede0192,2647e7cd03f2db701f58936b9c828c7a22b84558..e988a4ca73a5096a2f5492e9dadd12c1de6f721d
@@@ -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;
Simple merge
Simple merge