]> git.kaiwu.me - nginx.git/commitdiff
Merged with the default branch.
authorSergey Kandaurov <pluknet@nginx.com>
Wed, 29 Mar 2023 07:14:25 +0000 (11:14 +0400)
committerSergey Kandaurov <pluknet@nginx.com>
Wed, 29 Mar 2023 07:14:25 +0000 (11:14 +0400)
1  2 
auto/os/linux
src/core/ngx_connection.h
src/event/ngx_event_openssl.c
src/http/modules/ngx_http_ssl_module.c
src/http/ngx_http.c
src/http/ngx_http_core_module.c
src/http/ngx_http_core_module.h
src/http/ngx_http_request.c
src/stream/ngx_stream_proxy_module.c
src/stream/ngx_stream_ssl_module.c

diff --cc auto/os/linux
Simple merge
Simple merge
Simple merge
index 8ccf3c198008d025013b136fbe91f7bc40768396,93e1cd435a52e1429a93c05a4a41295ca3dc7338..d08002b8128e4ad5fb3ee3f12748350405a036f9
@@@ -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) {
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge