Fix header compression bug, and perform always incremental indexing

lib/nghttp2_hd.h

@@ -224,7 +224,7 @@ int nghttp2_hd_end_headers(nghttp2_hd_context *deflater_or_inflater);
 
 /* For unittesting purpose */
 int nghttp2_hd_emit_indname_block(uint8_t **buf_ptr, size_t *buflen_ptr,
-                                  size_t *offset_ptr, nghttp2_hd_entry *ent,
+                                  size_t *offset_ptr, size_t index,
                                   const uint8_t *value, size_t valuelen,
                                   int inc_indexing);
 
@@ -235,14 +235,13 @@ int nghttp2_hd_emit_newname_block(uint8_t **buf_ptr, size_t *buflen_ptr,
 
 /* For unittesting purpose */
 int nghttp2_hd_emit_subst_indname_block(uint8_t **buf_ptr, size_t *buflen_ptr,
-                                        size_t *offset_ptr,
-                                        nghttp2_hd_entry *ent,
+                                        size_t *offset_ptr, size_t index,
                                         const uint8_t *value, size_t valuelen,
-                                        size_t index);
+                                        size_t subindex);
 
 /* For unittesting purpose */
 int nghttp2_hd_emit_subst_newname_block(uint8_t **buf_ptr, size_t *buflen_ptr,
                                         size_t *offset_ptr, nghttp2_nv *nv,
-                                        size_t index);
+                                        size_t subindex);
 
 #endif /* NGHTTP2_HD_COMP_H */

tests/nghttp2_frame_test.c

@@ -119,6 +119,7 @@ void test_nghttp2_frame_pack_headers()
   nghttp2_frame_headers_init(&frame, NGHTTP2_FLAG_END_STREAM, 1000000007,
                              1 << 20, nva, nvlen);
   framelen = nghttp2_frame_pack_headers(&buf, &buflen, &frame, &deflater);
+  nghttp2_hd_end_headers(&deflater);
 
   CU_ASSERT(0 == unpack_frame_with_nv_block((nghttp2_frame*)&oframe,
                                             NGHTTP2_HEADERS,
@@ -133,10 +134,13 @@ void test_nghttp2_frame_pack_headers()
   CU_ASSERT(nvvalueeq("GET", &oframe.nva[0]));
 
   nghttp2_frame_headers_free(&oframe);
+  nghttp2_hd_end_headers(&inflater);
+
   memset(&oframe, 0, sizeof(oframe));
   /* Next, include PRIORITY flag */
   frame.hd.flags |= NGHTTP2_FLAG_PRIORITY;
   framelen = nghttp2_frame_pack_headers(&buf, &buflen, &frame, &deflater);
+  nghttp2_hd_end_headers(&deflater);
 
   CU_ASSERT(0 == unpack_frame_with_nv_block((nghttp2_frame*)&oframe,
                                             NGHTTP2_HEADERS,
@@ -279,6 +283,7 @@ void test_nghttp2_frame_pack_push_promise()
   nghttp2_frame_push_promise_init(&frame, NGHTTP2_FLAG_END_PUSH_PROMISE,
                                   1000000007, (1U << 31) - 1, nva, nvlen);
   framelen = nghttp2_frame_pack_push_promise(&buf, &buflen, &frame, &deflater);
+  nghttp2_hd_end_headers(&deflater);
 
   CU_ASSERT(0 == unpack_frame_with_nv_block((nghttp2_frame*)&oframe,
                                             NGHTTP2_PUSH_PROMISE,

tests/nghttp2_hd_test.c

@@ -81,8 +81,6 @@ void test_nghttp2_hd_deflate(void)
   nghttp2_nv_array_del(resnva);
   nghttp2_hd_end_headers(&inflater);
 
-  CU_ASSERT(2 == inflater.refsetlen);
-
   /* Second headers */
   blocklen = nghttp2_hd_deflate_hd(&deflater, &buf, &buflen, nv_offset, nva2,
                                    sizeof(nva2)/sizeof(nghttp2_nv));
@@ -157,10 +155,8 @@ void test_nghttp2_hd_inflate_indname_inc(void)
   nghttp2_nv *resnva;
   nghttp2_hd_inflate_init(&inflater, NGHTTP2_HD_SIDE_SERVER);
 
-  CU_ASSERT(0 == nghttp2_hd_emit_indname_block(&buf, &buflen, &offset,
-                                               inflater.hd_table[12],
-                                               nv.value, nv.valuelen,
-                                               1));
+  CU_ASSERT(0 == nghttp2_hd_emit_indname_block(&buf, &buflen, &offset, 12,
+                                               nv.value, nv.valuelen, 1));
   CU_ASSERT(1 == nghttp2_hd_inflate_hd(&inflater, &resnva, buf, offset));
   assert_nv_equal(&nv, resnva, 1);
   CU_ASSERT(39 == inflater.hd_tablelen);
@@ -184,8 +180,7 @@ void test_nghttp2_hd_inflate_indname_inc_eviction(void)
   nghttp2_nv *resnva;
   nghttp2_hd_inflate_init(&inflater, NGHTTP2_HD_SIDE_SERVER);
 
-  CU_ASSERT(0 == nghttp2_hd_emit_indname_block(&buf, &buflen, &offset,
-                                               inflater.hd_table[2],
+  CU_ASSERT(0 == nghttp2_hd_emit_indname_block(&buf, &buflen, &offset, 2,
                                                value, sizeof(value), 1));
   CU_ASSERT(1 == nghttp2_hd_inflate_hd(&inflater, &resnva, buf, offset));
   CU_ASSERT(5 == resnva[0].namelen);
@@ -235,7 +230,7 @@ void test_nghttp2_hd_inflate_indname_subst(void)
   nghttp2_hd_inflate_init(&inflater, NGHTTP2_HD_SIDE_SERVER);
 
   CU_ASSERT(0 == nghttp2_hd_emit_subst_indname_block(&buf, &buflen, &offset,
-                                                     inflater.hd_table[12],
+                                                     12,
                                                      nv.value, nv.valuelen,
                                                      12));
   CU_ASSERT(1 == nghttp2_hd_inflate_hd(&inflater, &resnva, buf, offset));
@@ -262,7 +257,7 @@ void test_nghttp2_hd_inflate_indname_subst_eviction(void)
   nghttp2_hd_inflate_init(&inflater, NGHTTP2_HD_SIDE_SERVER);
 
   CU_ASSERT(0 == nghttp2_hd_emit_subst_indname_block(&buf, &buflen, &offset,
-                                                     inflater.hd_table[2],
+                                                     2,
                                                      value, sizeof(value), 2));
   CU_ASSERT(1 == nghttp2_hd_inflate_hd(&inflater, &resnva, buf, offset));
   CU_ASSERT(5 == resnva[0].namelen);
@@ -293,7 +288,7 @@ void test_nghttp2_hd_inflate_indname_subst_eviction_neg(void)
   nghttp2_hd_inflate_init(&inflater, NGHTTP2_HD_SIDE_SERVER);
   /* Try to substitute index 0, but it will be evicted */
   CU_ASSERT(0 == nghttp2_hd_emit_subst_indname_block(&buf, &buflen, &offset,
-                                                     inflater.hd_table[2],
+                                                     2,
                                                      value, sizeof(value), 0));
   CU_ASSERT(1 == nghttp2_hd_inflate_hd(&inflater, &resnva, buf, offset));
   CU_ASSERT(5 == resnva[0].namelen);

tests/nghttp2_session_test.c

@@ -316,6 +316,8 @@ void test_nghttp2_session_recv(void)
   framelen = nghttp2_frame_pack_headers(&framedata, &framedatalen,
                                         &frame.headers,
                                         &session->hd_deflater);
+  nghttp2_hd_end_headers(&session->hd_deflater);
+
   scripted_data_feed_init(&df, framedata, framelen);
   /* Send 1 byte per each read */
   for(i = 0; i < framelen; ++i) {
@@ -336,6 +338,8 @@ void test_nghttp2_session_recv(void)
   framelen = nghttp2_frame_pack_headers(&framedata, &framedatalen,
                                         &frame.headers,
                                         &session->hd_deflater);
+  nghttp2_hd_end_headers(&session->hd_deflater);
+
   nghttp2_frame_headers_free(&frame.headers);
 
   scripted_data_feed_init(&df, framedata, framelen);
@@ -395,6 +399,8 @@ void test_nghttp2_session_recv_invalid_stream_id(void)
   framelen = nghttp2_frame_pack_headers(&framedata, &framedatalen,
                                         &frame.headers,
                                         &session->hd_deflater);
+  nghttp2_hd_end_headers(&session->hd_deflater);
+
   scripted_data_feed_init(&df, framedata, framelen);
   nghttp2_frame_headers_free(&frame.headers);
 
@@ -435,6 +441,8 @@ void test_nghttp2_session_recv_invalid_frame(void)
   framelen = nghttp2_frame_pack_headers(&framedata, &framedatalen,
                                         &frame.headers,
                                         &session->hd_deflater);
+  nghttp2_hd_end_headers(&session->hd_deflater);
+
   scripted_data_feed_init(&df, framedata, framelen);
 
   CU_ASSERT(0 == nghttp2_session_recv(session));