commit c6ad9ada8869f0b5b0a187f64ada0e848e95c0fe
author Valentin Bartenev <vbart@nginx.com> Tue Feb 02 16:33:55 2016 +0300
committer Valentin Bartenev <vbart@nginx.com> Tue Feb 02 16:33:55 2016 +0300
tree 47ab31bb056c02ad036d1b1cdc3a85cda318fa9f
parent 3000dbc56f58193784d6e4c6de4532ac91a918a8

HTTP/2: fixed padding handling in HEADERS frame with CONTINUATION.

src/http/v2/ngx_http_v2.c

diff --git a/src/http/v2/ngx_http_v2.c b/src/http/v2/ngx_http_v2.c
index b7106fe..4e378c9 100644
--- a/src/http/v2/ngx_http_v2.c
+++ b/src/http/v2/ngx_http_v2.c
@@ -1733,11 +1733,21 @@
     u_char *end, ngx_http_v2_handler_pt handler)
 {
     u_char    *p;
-    size_t     len;
+    size_t     len, skip;
     uint32_t   head;
 
     len = h2c->state.length;
 
+    if (h2c->state.padding && (size_t) (end - pos) > len) {
+        skip = ngx_min(h2c->state.padding, (end - pos) - len);
+
+        h2c->state.padding -= skip;
+
+        p = pos;
+        pos += skip;
+        ngx_memmove(pos, p, len);
+    }
+
     if ((size_t) (end - pos) < len + NGX_HTTP_V2_FRAME_HEADER_SIZE) {
         return ngx_http_v2_state_save(h2c, pos, end, handler);
     }