mirror
/
nginx
mirror of https://github.com/nginx/nginx
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge ce181590c8 into 7c2524a692

This commit is contained in:
Sergey Kandaurov 2025-12-17 00:37:58 +00:00 committed by GitHub
parent 7c2524a692 ce181590c8
commit b8de389e42
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 120 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
src/http/v3/ngx_http_v3_encode.c
View File

@ -135,10 +135,9 @@ ngx_http_v3_encode_field_ri(u_char *p, ngx_uint_t dynamic, ngx_uint_t index)
uintptr_t uintptr_t
ngx_http_v3_encode_field_lri(u_char *p, ngx_uint_t dynamic, ngx_uint_t index, ngx_http_v3_encode_field_lri(u_char *p, ngx_uint_t dynamic, ngx_uint_t index,
u_char *data, size_t len) u_char *data, size_t len, u_char *tmp)
{ {
size_t hlen; size_t hlen;
u_char *p1, *p2;
/* Literal Field Line With Name Reference */ /* Literal Field Line With Name Reference */
@ -151,28 +150,22 @@ ngx_http_v3_encode_field_lri(u_char *p, ngx_uint_t dynamic, ngx_uint_t index,
*p = dynamic ? 0x40 : 0x50; *p = dynamic ? 0x40 : 0x50;
p = (u_char *) ngx_http_v3_encode_prefix_int(p, index, 4); p = (u_char *) ngx_http_v3_encode_prefix_int(p, index, 4);
p1 = p; if (data == NULL) {
*p = 0; *p = 0;
p = (u_char *) ngx_http_v3_encode_prefix_int(p, len, 7); return ngx_http_v3_encode_prefix_int(p, len, 7);
}
if (data) { hlen = ngx_http_huff_encode(data, len, tmp, 0);
p2 = p;
hlen = ngx_http_huff_encode(data, len, p, 0);
if (hlen) { if (hlen) {
p = p1; *p = 0x80;
*p = 0x80; p = (u_char *) ngx_http_v3_encode_prefix_int(p, hlen, 7);
p = (u_char *) ngx_http_v3_encode_prefix_int(p, hlen, 7); p = ngx_cpymem(p, tmp, hlen);
if (p != p2) { } else {
ngx_memmove(p, p2, hlen); *p = 0;
} p = (u_char *) ngx_http_v3_encode_prefix_int(p, len, 7);
p = ngx_cpymem(p, data, len);
p += hlen;
} else {
p = ngx_cpymem(p, data, len);
}
} }
return (uintptr_t) p; return (uintptr_t) p;
@ -180,10 +173,10 @@ ngx_http_v3_encode_field_lri(u_char *p, ngx_uint_t dynamic, ngx_uint_t index,
uintptr_t uintptr_t
ngx_http_v3_encode_field_l(u_char *p, ngx_str_t *name, ngx_str_t *value) ngx_http_v3_encode_field_l(u_char *p, ngx_str_t *name, ngx_str_t *value,
u_char *tmp)
{ {
size_t hlen; size_t hlen;
u_char *p1, *p2;
/* Literal Field Line With Literal Name */ /* Literal Field Line With Literal Name */
@ -194,48 +187,30 @@ ngx_http_v3_encode_field_l(u_char *p, ngx_str_t *name, ngx_str_t *value)
+ value->len; + value->len;
} }
p1 = p; hlen = ngx_http_huff_encode(name->data, name->len, tmp, 1);
*p = 0x20;
p = (u_char *) ngx_http_v3_encode_prefix_int(p, name->len, 3);
p2 = p;
hlen = ngx_http_huff_encode(name->data, name->len, p, 1);
if (hlen) { if (hlen) {
p = p1;
*p = 0x28; *p = 0x28;
p = (u_char *) ngx_http_v3_encode_prefix_int(p, hlen, 3); p = (u_char *) ngx_http_v3_encode_prefix_int(p, hlen, 3);
p = ngx_cpymem(p, tmp, hlen);
if (p != p2) {
ngx_memmove(p, p2, hlen);
}
p += hlen;
} else { } else {
*p = 0x20;
p = (u_char *) ngx_http_v3_encode_prefix_int(p, name->len, 3);
ngx_strlow(p, name->data, name->len); ngx_strlow(p, name->data, name->len);
p += name->len; p += name->len;
} }
p1 = p; hlen = ngx_http_huff_encode(value->data, value->len, tmp, 0);
*p = 0;
p = (u_char *) ngx_http_v3_encode_prefix_int(p, value->len, 7);
p2 = p;
hlen = ngx_http_huff_encode(value->data, value->len, p, 0);
if (hlen) { if (hlen) {
p = p1;
*p = 0x80; *p = 0x80;
p = (u_char *) ngx_http_v3_encode_prefix_int(p, hlen, 7); p = (u_char *) ngx_http_v3_encode_prefix_int(p, hlen, 7);
p = ngx_cpymem(p, tmp, hlen);
if (p != p2) {
ngx_memmove(p, p2, hlen);
}
p += hlen;
} else { } else {
*p = 0;
p = (u_char *) ngx_http_v3_encode_prefix_int(p, value->len, 7);
p = ngx_cpymem(p, value->data, value->len); p = ngx_cpymem(p, value->data, value->len);
} }
@ -260,10 +235,9 @@ ngx_http_v3_encode_field_pbi(u_char *p, ngx_uint_t index)
uintptr_t uintptr_t
ngx_http_v3_encode_field_lpbi(u_char *p, ngx_uint_t index, u_char *data, ngx_http_v3_encode_field_lpbi(u_char *p, ngx_uint_t index, u_char *data,
size_t len) size_t len, u_char *tmp)
{ {
size_t hlen; size_t hlen;
u_char *p1, *p2;
/* Literal Field Line With Post-Base Name Reference */ /* Literal Field Line With Post-Base Name Reference */
@ -276,28 +250,22 @@ ngx_http_v3_encode_field_lpbi(u_char *p, ngx_uint_t index, u_char *data,
*p = 0; *p = 0;
p = (u_char *) ngx_http_v3_encode_prefix_int(p, index, 3); p = (u_char *) ngx_http_v3_encode_prefix_int(p, index, 3);
p1 = p; if (data == NULL) {
*p = 0; *p = 0;
p = (u_char *) ngx_http_v3_encode_prefix_int(p, len, 7); return ngx_http_v3_encode_prefix_int(p, len, 7);
}
if (data) { hlen = ngx_http_huff_encode(data, len, tmp, 0);
p2 = p;
hlen = ngx_http_huff_encode(data, len, p, 0);
if (hlen) { if (hlen) {
p = p1; *p = 0x80;
*p = 0x80; p = (u_char *) ngx_http_v3_encode_prefix_int(p, hlen, 7);
p = (u_char *) ngx_http_v3_encode_prefix_int(p, hlen, 7); p = ngx_cpymem(p, tmp, hlen);
if (p != p2) { } else {
ngx_memmove(p, p2, hlen); *p = 0;
} p = (u_char *) ngx_http_v3_encode_prefix_int(p, len, 7);
p = ngx_cpymem(p, data, len);
p += hlen;
} else {
p = ngx_cpymem(p, data, len);
}
} }
return (uintptr_t) p; return (uintptr_t) p;

6
src/http/v3/ngx_http_v3_encode.h
View File

@ -23,12 +23,12 @@ uintptr_t ngx_http_v3_encode_field_section_prefix(u_char *p,
uintptr_t ngx_http_v3_encode_field_ri(u_char *p, ngx_uint_t dynamic, uintptr_t ngx_http_v3_encode_field_ri(u_char *p, ngx_uint_t dynamic,
ngx_uint_t index); ngx_uint_t index);
uintptr_t ngx_http_v3_encode_field_lri(u_char *p, ngx_uint_t dynamic, uintptr_t ngx_http_v3_encode_field_lri(u_char *p, ngx_uint_t dynamic,
ngx_uint_t index, u_char *data, size_t len); ngx_uint_t index, u_char *data, size_t len, u_char *tmp);
uintptr_t ngx_http_v3_encode_field_l(u_char *p, ngx_str_t *name, uintptr_t ngx_http_v3_encode_field_l(u_char *p, ngx_str_t *name,
ngx_str_t *value); ngx_str_t *value, u_char *tmp);
uintptr_t ngx_http_v3_encode_field_pbi(u_char *p, ngx_uint_t index); uintptr_t ngx_http_v3_encode_field_pbi(u_char *p, ngx_uint_t index);
uintptr_t ngx_http_v3_encode_field_lpbi(u_char *p, ngx_uint_t index, uintptr_t ngx_http_v3_encode_field_lpbi(u_char *p, ngx_uint_t index,
u_char *data, size_t len); u_char *data, size_t len, u_char *tmp);
#endif /* _NGX_HTTP_V3_ENCODE_H_INCLUDED_ */ #endif /* _NGX_HTTP_V3_ENCODE_H_INCLUDED_ */

99
src/http/v3/ngx_http_v3_filter_module.c
View File

@ -84,8 +84,8 @@ static ngx_http_output_body_filter_pt ngx_http_next_body_filter;
static ngx_int_t static ngx_int_t
ngx_http_v3_header_filter(ngx_http_request_t *r) ngx_http_v3_header_filter(ngx_http_request_t *r)
{ {
u_char *p; u_char *p, *tmp;
size_t len, n; size_t len, tmp_len, n;
ngx_buf_t *b; ngx_buf_t *b;
ngx_str_t host, location; ngx_str_t host, location;
ngx_uint_t i, port; ngx_uint_t i, port;
@ -156,7 +156,7 @@ ngx_http_v3_header_filter(ngx_http_request_t *r)
} else { } else {
len += ngx_http_v3_encode_field_lri(NULL, 0, len += ngx_http_v3_encode_field_lri(NULL, 0,
NGX_HTTP_V3_HEADER_STATUS_200, NGX_HTTP_V3_HEADER_STATUS_200,
NULL, 3); NULL, 3, NULL);
} }
clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
@ -174,12 +174,13 @@ ngx_http_v3_header_filter(ngx_http_request_t *r)
len += ngx_http_v3_encode_field_lri(NULL, 0, len += ngx_http_v3_encode_field_lri(NULL, 0,
NGX_HTTP_V3_HEADER_SERVER, NGX_HTTP_V3_HEADER_SERVER,
NULL, n); NULL, n, NULL);
} }
if (r->headers_out.date == NULL) { if (r->headers_out.date == NULL) {
len += ngx_http_v3_encode_field_lri(NULL, 0, NGX_HTTP_V3_HEADER_DATE, len += ngx_http_v3_encode_field_lri(NULL, 0, NGX_HTTP_V3_HEADER_DATE,
NULL, ngx_cached_http_time.len); NULL, ngx_cached_http_time.len,
NULL);
} }
if (r->headers_out.content_type.len) { if (r->headers_out.content_type.len) {
@ -193,14 +194,14 @@ ngx_http_v3_header_filter(ngx_http_request_t *r)
len += ngx_http_v3_encode_field_lri(NULL, 0, len += ngx_http_v3_encode_field_lri(NULL, 0,
NGX_HTTP_V3_HEADER_CONTENT_TYPE_TEXT_PLAIN, NGX_HTTP_V3_HEADER_CONTENT_TYPE_TEXT_PLAIN,
NULL, n); NULL, n, NULL);
} }
if (r->headers_out.content_length == NULL) { if (r->headers_out.content_length == NULL) {
if (r->headers_out.content_length_n > 0) { if (r->headers_out.content_length_n > 0) {
len += ngx_http_v3_encode_field_lri(NULL, 0, len += ngx_http_v3_encode_field_lri(NULL, 0,
NGX_HTTP_V3_HEADER_CONTENT_LENGTH_ZERO, NGX_HTTP_V3_HEADER_CONTENT_LENGTH_ZERO,
NULL, NGX_OFF_T_LEN); NULL, NGX_OFF_T_LEN, NULL);
} else if (r->headers_out.content_length_n == 0) { } else if (r->headers_out.content_length_n == 0) {
len += ngx_http_v3_encode_field_ri(NULL, 0, len += ngx_http_v3_encode_field_ri(NULL, 0,
@ -213,7 +214,8 @@ ngx_http_v3_header_filter(ngx_http_request_t *r)
{ {
len += ngx_http_v3_encode_field_lri(NULL, 0, len += ngx_http_v3_encode_field_lri(NULL, 0,
NGX_HTTP_V3_HEADER_LAST_MODIFIED, NULL, NGX_HTTP_V3_HEADER_LAST_MODIFIED, NULL,
sizeof("Mon, 28 Sep 1970 06:00:00 GMT") - 1); sizeof("Mon, 28 Sep 1970 06:00:00 GMT") - 1,
NULL);
} }
if (r->headers_out.location && r->headers_out.location->value.len) { if (r->headers_out.location && r->headers_out.location->value.len) {
@ -279,9 +281,12 @@ ngx_http_v3_header_filter(ngx_http_request_t *r)
len += ngx_http_v3_encode_field_lri(NULL, 0, len += ngx_http_v3_encode_field_lri(NULL, 0,
NGX_HTTP_V3_HEADER_LOCATION, NULL, NGX_HTTP_V3_HEADER_LOCATION, NULL,
r->headers_out.location->value.len); r->headers_out.location->value.len,
NULL);
} }
tmp_len = len;
#if (NGX_HTTP_GZIP) #if (NGX_HTTP_GZIP)
if (r->gzip_vary) { if (r->gzip_vary) {
if (clcf->gzip_vary) { if (clcf->gzip_vary) {
@ -314,7 +319,20 @@ ngx_http_v3_header_filter(ngx_http_request_t *r)
} }
len += ngx_http_v3_encode_field_l(NULL, &header[i].key, len += ngx_http_v3_encode_field_l(NULL, &header[i].key,
&header[i].value); &header[i].value, NULL);
if (header[i].key.len > tmp_len) {
tmp_len = header[i].key.len;
}
if (header[i].value.len > tmp_len) {
tmp_len = header[i].value.len;
}
}
tmp = ngx_palloc(r->pool, tmp_len);
if (tmp == NULL) {
return NGX_ERROR;
} }
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, "http3 header len:%uz", len); ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, "http3 header len:%uz", len);
@ -338,7 +356,7 @@ ngx_http_v3_header_filter(ngx_http_request_t *r)
} else { } else {
b->last = (u_char *) ngx_http_v3_encode_field_lri(b->last, 0, b->last = (u_char *) ngx_http_v3_encode_field_lri(b->last, 0,
NGX_HTTP_V3_HEADER_STATUS_200, NGX_HTTP_V3_HEADER_STATUS_200,
NULL, 3); NULL, 3, tmp);
b->last = ngx_sprintf(b->last, "%03ui", r->headers_out.status); b->last = ngx_sprintf(b->last, "%03ui", r->headers_out.status);
} }
@ -361,7 +379,7 @@ ngx_http_v3_header_filter(ngx_http_request_t *r)
b->last = (u_char *) ngx_http_v3_encode_field_lri(b->last, 0, b->last = (u_char *) ngx_http_v3_encode_field_lri(b->last, 0,
NGX_HTTP_V3_HEADER_SERVER, NGX_HTTP_V3_HEADER_SERVER,
p, n); p, n, tmp);
} }
if (r->headers_out.date == NULL) { if (r->headers_out.date == NULL) {
@ -372,7 +390,8 @@ ngx_http_v3_header_filter(ngx_http_request_t *r)
b->last = (u_char *) ngx_http_v3_encode_field_lri(b->last, 0, b->last = (u_char *) ngx_http_v3_encode_field_lri(b->last, 0,
NGX_HTTP_V3_HEADER_DATE, NGX_HTTP_V3_HEADER_DATE,
ngx_cached_http_time.data, ngx_cached_http_time.data,
ngx_cached_http_time.len); ngx_cached_http_time.len,
tmp);
} }
if (r->headers_out.content_type.len) { if (r->headers_out.content_type.len) {
@ -408,7 +427,8 @@ ngx_http_v3_header_filter(ngx_http_request_t *r)
b->last = (u_char *) ngx_http_v3_encode_field_lri(b->last, 0, b->last = (u_char *) ngx_http_v3_encode_field_lri(b->last, 0,
NGX_HTTP_V3_HEADER_CONTENT_TYPE_TEXT_PLAIN, NGX_HTTP_V3_HEADER_CONTENT_TYPE_TEXT_PLAIN,
r->headers_out.content_type.data, r->headers_out.content_type.data,
r->headers_out.content_type.len); r->headers_out.content_type.len,
tmp);
} }
if (r->headers_out.content_length == NULL if (r->headers_out.content_length == NULL
@ -424,7 +444,7 @@ ngx_http_v3_header_filter(ngx_http_request_t *r)
b->last = (u_char *) ngx_http_v3_encode_field_lri(b->last, 0, b->last = (u_char *) ngx_http_v3_encode_field_lri(b->last, 0,
NGX_HTTP_V3_HEADER_CONTENT_LENGTH_ZERO, NGX_HTTP_V3_HEADER_CONTENT_LENGTH_ZERO,
NULL, n); NULL, n, tmp);
b->last = ngx_sprintf(b->last, "%O", b->last = ngx_sprintf(b->last, "%O",
r->headers_out.content_length_n); r->headers_out.content_length_n);
@ -452,7 +472,7 @@ ngx_http_v3_header_filter(ngx_http_request_t *r)
b->last = (u_char *) ngx_http_v3_encode_field_lri(b->last, 0, b->last = (u_char *) ngx_http_v3_encode_field_lri(b->last, 0,
NGX_HTTP_V3_HEADER_LAST_MODIFIED, NGX_HTTP_V3_HEADER_LAST_MODIFIED,
p, n); p, n, tmp);
} }
if (r->headers_out.location && r->headers_out.location->value.len) { if (r->headers_out.location && r->headers_out.location->value.len) {
@ -463,7 +483,8 @@ ngx_http_v3_header_filter(ngx_http_request_t *r)
b->last = (u_char *) ngx_http_v3_encode_field_lri(b->last, 0, b->last = (u_char *) ngx_http_v3_encode_field_lri(b->last, 0,
NGX_HTTP_V3_HEADER_LOCATION, NGX_HTTP_V3_HEADER_LOCATION,
r->headers_out.location->value.data, r->headers_out.location->value.data,
r->headers_out.location->value.len); r->headers_out.location->value.len,
tmp);
} }
#if (NGX_HTTP_GZIP) #if (NGX_HTTP_GZIP)
@ -501,7 +522,7 @@ ngx_http_v3_header_filter(ngx_http_request_t *r)
b->last = (u_char *) ngx_http_v3_encode_field_l(b->last, b->last = (u_char *) ngx_http_v3_encode_field_l(b->last,
&header[i].key, &header[i].key,
&header[i].value); &header[i].value, tmp);
} }
if (r->header_only) { if (r->header_only) {
@ -594,7 +615,8 @@ ngx_http_v3_header_filter(ngx_http_request_t *r)
static ngx_int_t static ngx_int_t
ngx_http_v3_early_hints_filter(ngx_http_request_t *r) ngx_http_v3_early_hints_filter(ngx_http_request_t *r)
{ {
size_t len, n; u_char *tmp;
size_t len, n, tmp_len;
ngx_buf_t *b; ngx_buf_t *b;
ngx_uint_t i; ngx_uint_t i;
ngx_chain_t *out, *hl, *cl; ngx_chain_t *out, *hl, *cl;
@ -611,6 +633,7 @@ ngx_http_v3_early_hints_filter(ngx_http_request_t *r)
} }
len = 0; len = 0;
tmp_len = 0;
part = &r->headers_out.headers.part; part = &r->headers_out.headers.part;
header = part->elts; header = part->elts;
@ -632,7 +655,15 @@ ngx_http_v3_early_hints_filter(ngx_http_request_t *r)
} }
len += ngx_http_v3_encode_field_l(NULL, &header[i].key, len += ngx_http_v3_encode_field_l(NULL, &header[i].key,
&header[i].value); &header[i].value, NULL);
if (header[i].key.len > tmp_len) {
tmp_len = header[i].key.len;
}
if (header[i].value.len > tmp_len) {
tmp_len = header[i].value.len;
}
} }
if (len == 0) { if (len == 0) {
@ -646,6 +677,11 @@ ngx_http_v3_early_hints_filter(ngx_http_request_t *r)
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
"http3 header len:%uz", len); "http3 header len:%uz", len);
tmp = ngx_palloc(r->pool, tmp_len);
if (tmp == NULL) {
return NGX_ERROR;
}
b = ngx_create_temp_buf(r->pool, len); b = ngx_create_temp_buf(r->pool, len);
if (b == NULL) { if (b == NULL) {
return NGX_ERROR; return NGX_ERROR;
@ -686,7 +722,7 @@ ngx_http_v3_early_hints_filter(ngx_http_request_t *r)
b->last = (u_char *) ngx_http_v3_encode_field_l(b->last, b->last = (u_char *) ngx_http_v3_encode_field_l(b->last,
&header[i].key, &header[i].key,
&header[i].value); &header[i].value, tmp);
} }
b->flush = 1; b->flush = 1;
@ -856,7 +892,8 @@ static ngx_chain_t *
ngx_http_v3_create_trailers(ngx_http_request_t *r, ngx_http_v3_create_trailers(ngx_http_request_t *r,
ngx_http_v3_filter_ctx_t *ctx) ngx_http_v3_filter_ctx_t *ctx)
{ {
size_t len, n; u_char *tmp;
size_t len, n, tmp_len;
u_char *p; u_char *p;
ngx_buf_t *b; ngx_buf_t *b;
ngx_uint_t i; ngx_uint_t i;
@ -868,6 +905,7 @@ ngx_http_v3_create_trailers(ngx_http_request_t *r,
h3c = ngx_http_v3_get_session(r->connection); h3c = ngx_http_v3_get_session(r->connection);
len = 0; len = 0;
tmp_len = 0;
part = &r->headers_out.trailers.part; part = &r->headers_out.trailers.part;
header = part->elts; header = part->elts;
@ -889,7 +927,15 @@ ngx_http_v3_create_trailers(ngx_http_request_t *r,
} }
len += ngx_http_v3_encode_field_l(NULL, &header[i].key, len += ngx_http_v3_encode_field_l(NULL, &header[i].key,
&header[i].value); &header[i].value, NULL);
if (header[i].key.len > tmp_len) {
tmp_len = header[i].key.len;
}
if (header[i].value.len > tmp_len) {
tmp_len = header[i].value.len;
}
} }
cl = ngx_chain_get_free_buf(r->pool, &ctx->free); cl = ngx_chain_get_free_buf(r->pool, &ctx->free);
@ -911,6 +957,11 @@ ngx_http_v3_create_trailers(ngx_http_request_t *r,
b->temporary = 1; b->temporary = 1;
tmp = ngx_palloc(r->pool, tmp_len);
if (tmp == NULL) {
return NULL;
}
len += ngx_http_v3_encode_field_section_prefix(NULL, 0, 0, 0); len += ngx_http_v3_encode_field_section_prefix(NULL, 0, 0, 0);
b->pos = ngx_palloc(r->pool, len); b->pos = ngx_palloc(r->pool, len);
@ -946,7 +997,7 @@ ngx_http_v3_create_trailers(ngx_http_request_t *r,
b->last = (u_char *) ngx_http_v3_encode_field_l(b->last, b->last = (u_char *) ngx_http_v3_encode_field_l(b->last,
&header[i].key, &header[i].key,
&header[i].value); &header[i].value, tmp);
} }
n = b->last - b->pos; n = b->last - b->pos;

3
src/http/v3/ngx_http_v3_request.c
View File

@ -584,7 +584,8 @@ ngx_http_v3_process_request(ngx_event_t *rev)
h3c->payload_bytes += ngx_http_v3_encode_field_l(NULL, h3c->payload_bytes += ngx_http_v3_encode_field_l(NULL,
&st->field_rep.field.name, &st->field_rep.field.name,
&st->field_rep.field.value); &st->field_rep.field.value,
NULL);
if (ngx_http_v3_process_header(r, &st->field_rep.field.name, if (ngx_http_v3_process_header(r, &st->field_rep.field.name,
&st->field_rep.field.value) &st->field_rep.field.value)