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

This commit is contained in:
Sergey Kandaurov 2021-12-02 13:59:09 +03:00
parent 468641cbc3
commit 7e7e552a10
3 changed files with 6 additions and 6 deletions

View File

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

View File

@ -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;
}

View File

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