From 7e7e552a10b9e5d0fd94b1a657061253ccac709e Mon Sep 17 00:00:00 2001 From: Sergey Kandaurov Date: Thu, 2 Dec 2021 13:59:09 +0300 Subject: [PATCH] HTTP/3: adjusted ALPN macro names to align with 61abb35bb8cf. --- src/http/modules/ngx_http_quic_module.h | 2 +- src/http/modules/ngx_http_ssl_module.c | 8 ++++---- src/http/v3/ngx_http_v3.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/http/modules/ngx_http_quic_module.h b/src/http/modules/ngx_http_quic_module.h index 8cadfbb87..3b96fcc47 100644 --- a/src/http/modules/ngx_http_quic_module.h +++ b/src/http/modules/ngx_http_quic_module.h @@ -14,7 +14,7 @@ #include -#define NGX_HTTP_QUIC_ALPN_ADVERTISE "\x0Ahq-interop" +#define NGX_HTTP_QUIC_ALPN_PROTO "\x0Ahq-interop" #define NGX_HTTP_QUIC_ALPN_DRAFT_FMT "\x05hq-%02uD" diff --git a/src/http/modules/ngx_http_ssl_module.c b/src/http/modules/ngx_http_ssl_module.c index f2a85f12e..afeb68462 100644 --- a/src/http/modules/ngx_http_ssl_module.c +++ b/src/http/modules/ngx_http_ssl_module.c @@ -455,15 +455,15 @@ ngx_http_ssl_alpn_select(ngx_ssl_conn_t *ssl_conn, const unsigned char **out, if (hc->addr_conf->quic) { #if (NGX_HTTP_V3) if (hc->addr_conf->http3) { - srv = (unsigned char *) NGX_HTTP_V3_ALPN_ADVERTISE; - srvlen = sizeof(NGX_HTTP_V3_ALPN_ADVERTISE) - 1; + srv = (unsigned char *) NGX_HTTP_V3_ALPN_PROTO; + srvlen = sizeof(NGX_HTTP_V3_ALPN_PROTO) - 1; fmt = NGX_HTTP_V3_ALPN_DRAFT_FMT; } else #endif { - srv = (unsigned char *) NGX_HTTP_QUIC_ALPN_ADVERTISE; - srvlen = sizeof(NGX_HTTP_QUIC_ALPN_ADVERTISE) - 1; + srv = (unsigned char *) NGX_HTTP_QUIC_ALPN_PROTO; + srvlen = sizeof(NGX_HTTP_QUIC_ALPN_PROTO) - 1; fmt = NGX_HTTP_QUIC_ALPN_DRAFT_FMT; } diff --git a/src/http/v3/ngx_http_v3.h b/src/http/v3/ngx_http_v3.h index 97e8a1c29..758cbd1af 100644 --- a/src/http/v3/ngx_http_v3.h +++ b/src/http/v3/ngx_http_v3.h @@ -19,7 +19,7 @@ #include -#define NGX_HTTP_V3_ALPN_ADVERTISE "\x02h3" +#define NGX_HTTP_V3_ALPN_PROTO "\x02h3" #define NGX_HTTP_V3_ALPN_DRAFT_FMT "\x05h3-%02uD" #define NGX_HTTP_V3_VARLEN_INT_LEN 4