HTTP/3: adjusted ALPN macro names to align with 61abb35bb8cf.

diff --git a/src/http/modules/ngx_http_quic_module.h b/src/http/modules/ngx_http_quic_module.h
index 8cadfbb878be07b72e12ccc8ed0973d6e3ef7813..3b96fcc473f42be68ea362b2bb1af2a117aacd70 100644 (file)
--- a/src/http/modules/ngx_http_quic_module.h
+++ b/src/http/modules/ngx_http_quic_module.h
@@ -14,7 +14,7 @@
 #include <ngx_http.h>
 
 
-#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 f2a85f12e8a981c1405ba03fea8cdf85aec48f42..afeb684621d505884db3c9e8036d40b17f144b3f 100644 (file)
--- 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 97e8a1c291c7885f4451296204dbd1aa18782813..758cbd1af56310fd5daf568956dc6f6a31b47094 100644 (file)
--- a/src/http/v3/ngx_http_v3.h
+++ b/src/http/v3/ngx_http_v3.h
@@ -19,7 +19,7 @@
 #include <ngx_http_v3_tables.h>
 
 
-#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