IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

HTTP/3: removed "http3" parameter of "listen" directive.

Browse Source 
The parameter has been deprecated since c851a2ed5ce8.
This commit is contained in:
Roman Arutyunyan 2023-05-11 13:22:10 +04:00
parent 6cc803e713
commit 2ce3eeeeb7
5 changed files with 7 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/http/modules/ngx_http_ssl_module.c
View File

@ -477,7 +477,7 @@ ngx_http_ssl_alpn_select(ngx_ssl_conn_t *ssl_conn, const unsigned char **out,
srv = (unsigned char *) NGX_HTTP_V3_HQ_ALPN_PROTO; srv = (unsigned char *) NGX_HTTP_V3_HQ_ALPN_PROTO;
srvlen = sizeof(NGX_HTTP_V3_HQ_ALPN_PROTO) - 1; srvlen = sizeof(NGX_HTTP_V3_HQ_ALPN_PROTO) - 1;
} else if (h3scf->enable || hc->addr_conf->http3) { } else if (h3scf->enable) {
srv = (unsigned char *) NGX_HTTP_V3_ALPN_PROTO; srv = (unsigned char *) NGX_HTTP_V3_ALPN_PROTO;
srvlen = sizeof(NGX_HTTP_V3_ALPN_PROTO) - 1; srvlen = sizeof(NGX_HTTP_V3_ALPN_PROTO) - 1;

5
src/http/ngx_http.c
View File

@ -1242,7 +1242,6 @@ ngx_http_add_addresses(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf,
ngx_uint_t http2; ngx_uint_t http2;
#endif #endif
#if (NGX_HTTP_V3) #if (NGX_HTTP_V3)
ngx_uint_t http3;
ngx_uint_t quic; ngx_uint_t quic;
#endif #endif
@ -1287,7 +1286,6 @@ ngx_http_add_addresses(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf,
protocols_prev |= addr[i].opt.http2 << 2; protocols_prev |= addr[i].opt.http2 << 2;
#endif #endif
#if (NGX_HTTP_V3) #if (NGX_HTTP_V3)
http3 = lsopt->http3 || addr[i].opt.http3;
quic = lsopt->quic || addr[i].opt.quic; quic = lsopt->quic || addr[i].opt.quic;
#endif #endif
@ -1378,7 +1376,6 @@ ngx_http_add_addresses(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf,
addr[i].opt.http2 = http2; addr[i].opt.http2 = http2;
#endif #endif
#if (NGX_HTTP_V3) #if (NGX_HTTP_V3)
addr[i].opt.http3 = http3;
addr[i].opt.quic = quic; addr[i].opt.quic = quic;
#endif #endif
@ -1929,7 +1926,6 @@ ngx_http_add_addrs(ngx_conf_t *cf, ngx_http_port_t *hport,
addrs[i].conf.http2 = addr[i].opt.http2; addrs[i].conf.http2 = addr[i].opt.http2;
#endif #endif
#if (NGX_HTTP_V3) #if (NGX_HTTP_V3)
addrs[i].conf.http3 = addr[i].opt.http3;
addrs[i].conf.quic = addr[i].opt.quic; addrs[i].conf.quic = addr[i].opt.quic;
#endif #endif
addrs[i].conf.proxy_protocol = addr[i].opt.proxy_protocol; addrs[i].conf.proxy_protocol = addr[i].opt.proxy_protocol;
@ -1998,7 +1994,6 @@ ngx_http_add_addrs6(ngx_conf_t *cf, ngx_http_port_t *hport,
addrs6[i].conf.http2 = addr[i].opt.http2; addrs6[i].conf.http2 = addr[i].opt.http2;
#endif #endif
#if (NGX_HTTP_V3) #if (NGX_HTTP_V3)
addrs6[i].conf.http3 = addr[i].opt.http3;
addrs6[i].conf.quic = addr[i].opt.quic; addrs6[i].conf.quic = addr[i].opt.quic;
#endif #endif
addrs6[i].conf.proxy_protocol = addr[i].opt.proxy_protocol; addrs6[i].conf.proxy_protocol = addr[i].opt.proxy_protocol;

17
src/http/ngx_http_core_module.c
View File

@ -4186,23 +4186,6 @@ ngx_http_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
#endif #endif
} }
if (ngx_strcmp(value[n].data, "http3") == 0) {
#if (NGX_HTTP_V3)
ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
"the \"http3\" parameter is deprecated, "
"use \"quic\" parameter instead");
lsopt.quic = 1;
lsopt.http3 = 1;
lsopt.type = SOCK_DGRAM;
continue;
#else
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"the \"http3\" parameter requires "
"ngx_http_v3_module");
return NGX_CONF_ERROR;
#endif
}
if (ngx_strcmp(value[n].data, "quic") == 0) { if (ngx_strcmp(value[n].data, "quic") == 0) {
#if (NGX_HTTP_V3) #if (NGX_HTTP_V3)
lsopt.quic = 1; lsopt.quic = 1;

2
src/http/ngx_http_core_module.h
View File

@ -75,7 +75,6 @@ typedef struct {
unsigned wildcard:1; unsigned wildcard:1;
unsigned ssl:1; unsigned ssl:1;
unsigned http2:1; unsigned http2:1;
unsigned http3:1;
unsigned quic:1; unsigned quic:1;
#if (NGX_HAVE_INET6) #if (NGX_HAVE_INET6)
unsigned ipv6only:1; unsigned ipv6only:1;
@ -240,7 +239,6 @@ struct ngx_http_addr_conf_s {
unsigned ssl:1; unsigned ssl:1;
unsigned http2:1; unsigned http2:1;
unsigned http3:1;
unsigned quic:1; unsigned quic:1;
unsigned proxy_protocol:1; unsigned proxy_protocol:1;
}; };

2
src/http/v3/ngx_http_v3_request.c
View File

@ -1014,7 +1014,6 @@ ngx_http_v3_process_request_header(ngx_http_request_t *r)
h3c = ngx_http_v3_get_session(c); h3c = ngx_http_v3_get_session(c);
h3scf = ngx_http_get_module_srv_conf(r, ngx_http_v3_module); h3scf = ngx_http_get_module_srv_conf(r, ngx_http_v3_module);
if (!r->http_connection->addr_conf->http3) {
if ((h3c->hq && !h3scf->enable_hq) || (!h3c->hq && !h3scf->enable)) { if ((h3c->hq && !h3scf->enable_hq) || (!h3c->hq && !h3scf->enable)) {
ngx_log_error(NGX_LOG_INFO, c->log, 0, ngx_log_error(NGX_LOG_INFO, c->log, 0,
"client attempted to request the server name " "client attempted to request the server name "
@ -1022,7 +1021,6 @@ ngx_http_v3_process_request_header(ngx_http_request_t *r)
ngx_http_finalize_request(r, NGX_HTTP_MISDIRECTED_REQUEST); ngx_http_finalize_request(r, NGX_HTTP_MISDIRECTED_REQUEST);
return NGX_ERROR; return NGX_ERROR;
} }
}
if (ngx_http_v3_construct_cookie_header(r) != NGX_OK) { if (ngx_http_v3_construct_cookie_header(r) != NGX_OK) {
return NGX_ERROR; return NGX_ERROR;