From: Sergey Kandaurov <pluknet@nginx.com>
Date: Wed, 29 Mar 2023 07:14:25 +0000 (+0400)
Subject: Merged with the default branch.
X-Git-Tag: release-1.25.0~4^2~24
X-Git-Url: http://git.kaiwu.me/sitemap.xml?a=commitdiff_plain;h=e8fbc967470b39513248cd961ccccf7a032831ea;p=nginx.git

Merged with the default branch.
---

e8fbc967470b39513248cd961ccccf7a032831ea
diff --cc src/http/ngx_http.c
index 8ccf3c198,93e1cd435..d08002b81
--- a/src/http/ngx_http.c
+++ b/src/http/ngx_http.c
@@@ -1278,11 -1275,9 +1283,13 @@@ ngx_http_add_addresses(ngx_conf_t *cf, 
  #endif
  #if (NGX_HTTP_V2)
          http2 = lsopt->http2 || addr[i].opt.http2;
+         protocols |= lsopt->http2 << 2;
+         protocols_prev |= addr[i].opt.http2 << 2;
  #endif
 +#if (NGX_HTTP_V3)
 +        http3 = lsopt->http3 || addr[i].opt.http3;
 +        quic = lsopt->quic || addr[i].opt.quic;
 +#endif
  
          if (lsopt->set) {