From 4aa17fdc2c433827edae0815bc806640b66f9e5e Mon Sep 17 00:00:00 2001 From: Hakase Date: Tue, 5 Jun 2018 23:38:40 +0900 Subject: [PATCH] Some sources were missing. --- nginx_hpack_push.patch | 8 ++++++-- nginx_hpack_push_fix.patch | 13 +++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/nginx_hpack_push.patch b/nginx_hpack_push.patch index 0d65f97..610a53f 100644 --- a/nginx_hpack_push.patch +++ b/nginx_hpack_push.patch @@ -153,7 +153,7 @@ index 77ebb847..303d157f 100644 break; } diff --git a/src/http/v2/ngx_http_v2.h b/src/http/v2/ngx_http_v2.h -index ebd0e77c..bb89a634 100644 +index ebd0e77c..b152b504 100644 --- a/src/http/v2/ngx_http_v2.h +++ b/src/http/v2/ngx_http_v2.h @@ -52,6 +52,14 @@ @@ -248,7 +248,7 @@ index ebd0e77c..bb89a634 100644 ngx_pool_t *pool; unsigned waiting:1; -@@ -410,4 +467,31 @@ u_char *ngx_http_v2_string_encode(u_char *dst, u_char *src, size_t len, +@@ -410,4 +467,35 @@ u_char *ngx_http_v2_string_encode(u_char *dst, u_char *src, size_t len, u_char *tmp, ngx_uint_t lower); @@ -278,6 +278,10 @@ index ebd0e77c..bb89a634 100644 +#define ngx_http_v2_write_header_tbl(key, val) \ + ngx_http_v2_write_header(h2c, pos, (u_char *) key, sizeof(key) - 1, \ + val.data, val.len, tmp); ++ ++#define ngx_http_v2_write_header_pot(key, val) \ ++ ngx_http_v2_write_header(h2c, pos, (u_char *) key, sizeof(key) - 1, \ ++ val->data, val->len, tmp); + #endif /* _NGX_HTTP_V2_H_INCLUDED_ */ diff --git a/src/http/v2/ngx_http_v2_encode.c b/src/http/v2/ngx_http_v2_encode.c diff --git a/nginx_hpack_push_fix.patch b/nginx_hpack_push_fix.patch index 0798695..4157fb6 100644 --- a/nginx_hpack_push_fix.patch +++ b/nginx_hpack_push_fix.patch @@ -1,3 +1,16 @@ +diff --git a/src/http/v2/ngx_http_v2.h b/src/http/v2/ngx_http_v2.h +index ae826af..41086a6 100644 +--- a/src/http/v2/ngx_http_v2.h ++++ b/src/http/v2/ngx_http_v2.h +@@ -490,4 +490,8 @@ ngx_http_v2_table_resize(ngx_http_v2_connection_t *h2c); + ngx_http_v2_write_header(h2c, pos, (u_char *) key, sizeof(key) - 1, \ + val.data, val.len, tmp); + ++#define ngx_http_v2_write_header_pot(key, val) \ ++ ngx_http_v2_write_header(h2c, pos, (u_char *) key, sizeof(key) - 1, \ ++ val->data, val->len, tmp); ++ + #endif /* _NGX_HTTP_V2_H_INCLUDED_ */ diff --git a/src/http/v2/ngx_http_v2_filter_module.c b/src/http/v2/ngx_http_v2_filter_module.c index 6a210d4..8a59424 100644 --- a/src/http/v2/ngx_http_v2_filter_module.c