Mercurial > hg > nginx

changeset 8918:606bf52888d2 quic

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
HTTP/3: adjusted ALPN macro names to align with 61abb35bb8cf.
author Sergey Kandaurov <pluknet@nginx.com>
date Thu, 02 Dec 2021 13:59:09 +0300
parents bb1d1d9d76e2
children a6a328ebd362
files src/http/modules/ngx_http_quic_module.h src/http/modules/ngx_http_ssl_module.c src/http/v3/ngx_http_v3.h
diffstat 3 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- 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"
 
 
--- 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 
     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;
         }
 
--- 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