From: Sergey Kandaurov <pluknet@nginx.com>
Date: Thu, 2 Dec 2021 10:59:09 +0000 (+0300)
Subject: HTTP/3: adjusted ALPN macro names to align with 61abb35bb8cf.
X-Git-Url: http://git.kaiwu.me/postgresql/log/contrib/postgres_fdw/static/gitweb.js?a=commitdiff_plain;h=7e7e552a10b9e5d0fd94b1a657061253ccac709e;p=nginx.git

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 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 <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 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 <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