diff options
Diffstat (limited to 'src/http/ngx_http.c')
| -rw-r--r-- | src/http/ngx_http.c | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c index 908e88103..187d867bb 100644 --- a/src/http/ngx_http.c +++ b/src/http/ngx_http.c @@ -1237,13 +1237,11 @@ ngx_http_add_addresses(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf, #if (NGX_HTTP_SSL) ngx_uint_t ssl; #endif -#if (NGX_HTTP_QUIC) - ngx_uint_t quic; -#endif #if (NGX_HTTP_V2) ngx_uint_t http2; #endif #if (NGX_HTTP_V3) + ngx_uint_t quic; ngx_uint_t http3; #endif @@ -1278,13 +1276,11 @@ ngx_http_add_addresses(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf, #if (NGX_HTTP_SSL) ssl = lsopt->ssl || addr[i].opt.ssl; #endif -#if (NGX_HTTP_QUIC) - quic = lsopt->quic || addr[i].opt.quic; -#endif #if (NGX_HTTP_V2) http2 = lsopt->http2 || addr[i].opt.http2; #endif #if (NGX_HTTP_V3) + quic = lsopt->quic || addr[i].opt.quic; http3 = lsopt->http3 || addr[i].opt.http3; #endif @@ -1320,13 +1316,11 @@ ngx_http_add_addresses(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf, #if (NGX_HTTP_SSL) addr[i].opt.ssl = ssl; #endif -#if (NGX_HTTP_QUIC) - addr[i].opt.quic = quic; -#endif #if (NGX_HTTP_V2) addr[i].opt.http2 = http2; #endif #if (NGX_HTTP_V3) + addr[i].opt.quic = quic; addr[i].opt.http3 = http3; #endif @@ -1371,7 +1365,7 @@ ngx_http_add_address(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf, #endif -#if (NGX_HTTP_QUIC && !defined NGX_QUIC) +#if (NGX_HTTP_V3 && !defined NGX_QUIC) if (lsopt->quic) { ngx_conf_log_error(NGX_LOG_WARN, cf, 0, @@ -1841,7 +1835,7 @@ ngx_http_add_listening(ngx_conf_t *cf, ngx_http_conf_addr_t *addr) ls->wildcard = addr->opt.wildcard; -#if (NGX_HTTP_QUIC) +#if (NGX_HTTP_V3) ls->quic = addr->opt.quic; #endif @@ -1874,13 +1868,11 @@ ngx_http_add_addrs(ngx_conf_t *cf, ngx_http_port_t *hport, #if (NGX_HTTP_SSL) addrs[i].conf.ssl = addr[i].opt.ssl; #endif -#if (NGX_HTTP_QUIC) - addrs[i].conf.quic = addr[i].opt.quic; -#endif #if (NGX_HTTP_V2) addrs[i].conf.http2 = addr[i].opt.http2; #endif #if (NGX_HTTP_V3) + addrs[i].conf.quic = addr[i].opt.quic; addrs[i].conf.http3 = addr[i].opt.http3; #endif addrs[i].conf.proxy_protocol = addr[i].opt.proxy_protocol; @@ -1945,13 +1937,11 @@ ngx_http_add_addrs6(ngx_conf_t *cf, ngx_http_port_t *hport, #if (NGX_HTTP_SSL) addrs6[i].conf.ssl = addr[i].opt.ssl; #endif -#if (NGX_HTTP_QUIC) - addrs6[i].conf.quic = addr[i].opt.quic; -#endif #if (NGX_HTTP_V2) addrs6[i].conf.http2 = addr[i].opt.http2; #endif #if (NGX_HTTP_V3) + addrs6[i].conf.quic = addr[i].opt.quic; addrs6[i].conf.http3 = addr[i].opt.http3; #endif addrs6[i].conf.proxy_protocol = addr[i].opt.proxy_protocol; |