diff options
| author | Ruslan Ermilov <ru@nginx.com> | 2021-12-24 15:53:59 +0300 |
|---|---|---|
| committer | Ruslan Ermilov <ru@nginx.com> | 2021-12-24 15:53:59 +0300 |
| commit | fa4da058549d122387f5d553b62b0ec15b84ddc8 (patch) | |
| tree | db7b2f8666f24e805b4e5c13c021b0f6cac9dbd6 /src/http/v3 | |
| parent | 3341a850763eec48263a4ab2fd3a35008b11da3e (diff) | |
| parent | 363505e806feebb7ceb1f9edb0e3f75c1253384f (diff) | |
| download | nginx-fa4da058549d122387f5d553b62b0ec15b84ddc8.tar.gz nginx-fa4da058549d122387f5d553b62b0ec15b84ddc8.tar.bz2 | |
Merged with the default branch.
Diffstat (limited to 'src/http/v3')
| -rw-r--r-- | src/http/v3/ngx_http_v3_encode.c | 8 | ||||
| -rw-r--r-- | src/http/v3/ngx_http_v3_parse.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/http/v3/ngx_http_v3_encode.c b/src/http/v3/ngx_http_v3_encode.c index a62f5d30f..fb089c413 100644 --- a/src/http/v3/ngx_http_v3_encode.c +++ b/src/http/v3/ngx_http_v3_encode.c @@ -157,7 +157,7 @@ ngx_http_v3_encode_field_lri(u_char *p, ngx_uint_t dynamic, ngx_uint_t index, if (data) { p2 = p; - hlen = ngx_http_v2_huff_encode(data, len, p, 0); + hlen = ngx_http_huff_encode(data, len, p, 0); if (hlen) { p = p1; @@ -199,7 +199,7 @@ ngx_http_v3_encode_field_l(u_char *p, ngx_str_t *name, ngx_str_t *value) p = (u_char *) ngx_http_v3_encode_prefix_int(p, name->len, 3); p2 = p; - hlen = ngx_http_v2_huff_encode(name->data, name->len, p, 1); + hlen = ngx_http_huff_encode(name->data, name->len, p, 1); if (hlen) { p = p1; @@ -222,7 +222,7 @@ ngx_http_v3_encode_field_l(u_char *p, ngx_str_t *name, ngx_str_t *value) p = (u_char *) ngx_http_v3_encode_prefix_int(p, value->len, 7); p2 = p; - hlen = ngx_http_v2_huff_encode(value->data, value->len, p, 0); + hlen = ngx_http_huff_encode(value->data, value->len, p, 0); if (hlen) { p = p1; @@ -282,7 +282,7 @@ ngx_http_v3_encode_field_lpbi(u_char *p, ngx_uint_t index, u_char *data, if (data) { p2 = p; - hlen = ngx_http_v2_huff_encode(data, len, p, 0); + hlen = ngx_http_huff_encode(data, len, p, 0); if (hlen) { p = p1; diff --git a/src/http/v3/ngx_http_v3_parse.c b/src/http/v3/ngx_http_v3_parse.c index 3f676b4bb..25c1edf6d 100644 --- a/src/http/v3/ngx_http_v3_parse.c +++ b/src/http/v3/ngx_http_v3_parse.c @@ -638,8 +638,8 @@ ngx_http_v3_parse_literal(ngx_connection_t *c, ngx_http_v3_parse_literal_t *st, ch = *b->pos++; if (st->huffman) { - if (ngx_http_v2_huff_decode(&st->huffstate, &ch, 1, &st->last, - st->length == 1, c->log) + if (ngx_http_huff_decode(&st->huffstate, &ch, 1, &st->last, + st->length == 1, c->log) != NGX_OK) { return NGX_ERROR; |