Mercurial > hg > nginx

diff src/http/ngx_http.c @ 9081:c851a2ed5ce8 quic

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
HTTP/3: "quic" parameter of "listen" directive. Now "listen" directve has a new "quic" parameter which enables QUIC protocol for the address. Further, to enable HTTP/3, a new directive "http3" is introduced. The hq-interop protocol is enabled by "http3_hq" as before. Now application protocol is chosen by ALPN. Previously used "http3" parameter of "listen" is deprecated.
author Roman Arutyunyan <arut@nginx.com>
date Mon, 27 Feb 2023 14:00:56 +0400
parents c2f5d79cde64
children 0af598651e33
line wrap: on
line diff
--- a/src/http/ngx_http.c
+++ b/src/http/ngx_http.c
@@ -1242,6 +1242,7 @@ ngx_http_add_addresses(ngx_conf_t *cf, n
 #endif
 #if (NGX_HTTP_V3)
     ngx_uint_t             http3;
+    ngx_uint_t             quic;
 #endif
 
     /*
@@ -1280,6 +1281,7 @@ ngx_http_add_addresses(ngx_conf_t *cf, n
 #endif
 #if (NGX_HTTP_V3)
         http3 = lsopt->http3 || addr[i].opt.http3;
+        quic = lsopt->quic || addr[i].opt.quic;
 #endif
 
         if (lsopt->set) {
@@ -1319,6 +1321,7 @@ ngx_http_add_addresses(ngx_conf_t *cf, n
 #endif
 #if (NGX_HTTP_V3)
         addr[i].opt.http3 = http3;
+        addr[i].opt.quic = quic;
 #endif
 
         return NGX_OK;
@@ -1823,7 +1826,7 @@ ngx_http_add_listening(ngx_conf_t *cf, n
 
 #if (NGX_HTTP_V3)
 
-    ls->quic = addr->opt.http3;
+    ls->quic = addr->opt.quic;
 
     if (ls->quic) {
         ngx_rbtree_init(&ls->rbtree, &ls->sentinel,
@@ -1866,6 +1869,7 @@ ngx_http_add_addrs(ngx_conf_t *cf, ngx_h
 #endif
 #if (NGX_HTTP_V3)
         addrs[i].conf.http3 = addr[i].opt.http3;
+        addrs[i].conf.quic = addr[i].opt.quic;
 #endif
         addrs[i].conf.proxy_protocol = addr[i].opt.proxy_protocol;
 
@@ -1934,6 +1938,7 @@ ngx_http_add_addrs6(ngx_conf_t *cf, ngx_
 #endif
 #if (NGX_HTTP_V3)
         addrs6[i].conf.http3 = addr[i].opt.http3;
+        addrs6[i].conf.quic = addr[i].opt.quic;
 #endif
         addrs6[i].conf.proxy_protocol = addr[i].opt.proxy_protocol;