From d1b8f607769575dad910c86a47ff7cbadfe96e65 Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Sat, 24 Oct 2015 18:11:47 +0900
Subject: [PATCH] nghttp: Allow multiple -c option occurrence, and take min and
 last value

---
 src/nghttp.cc | 29 ++++++++++++++++++++++-------
 src/nghttp.h  |  3 ++-
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/nghttp.cc b/src/nghttp.cc
index 5d85e489..2d14367a 100644
--- a/src/nghttp.cc
+++ b/src/nghttp.cc
@@ -94,13 +94,15 @@ constexpr auto anchors = std::array<Anchor, 5>{{
 } // namespace
 
 Config::Config()
-    : padding(0), max_concurrent_streams(100),
+    : header_table_size(-1),
+      min_header_table_size(std::numeric_limits<uint32_t>::max()), padding(0),
+      max_concurrent_streams(100),
       peer_max_concurrent_streams(NGHTTP2_INITIAL_MAX_CONCURRENT_STREAMS),
-      header_table_size(-1), weight(NGHTTP2_DEFAULT_WEIGHT), multiply(1),
-      timeout(0.), window_bits(-1), connection_window_bits(-1), verbose(0),
-      null_out(false), remote_name(false), get_assets(false), stat(false),
-      upgrade(false), continuation(false), no_content_length(false),
-      no_dep(false), hexdump(false), no_push(false) {
+      weight(NGHTTP2_DEFAULT_WEIGHT), multiply(1), timeout(0.), window_bits(-1),
+      connection_window_bits(-1), verbose(0), null_out(false),
+      remote_name(false), get_assets(false), stat(false), upgrade(false),
+      continuation(false), no_content_length(false), no_dep(false),
+      hexdump(false), no_push(false) {
   nghttp2_option_new(&http2_option);
   nghttp2_option_set_peer_max_concurrent_streams(http2_option,
                                                  peer_max_concurrent_streams);
@@ -768,6 +770,12 @@ size_t populate_settings(nghttp2_settings_entry *iv) {
   }
 
   if (config.header_table_size >= 0) {
+    if (config.min_header_table_size < config.header_table_size) {
+      iv[niv].settings_id = NGHTTP2_SETTINGS_HEADER_TABLE_SIZE;
+      iv[niv].value = config.min_header_table_size;
+      ++niv;
+    }
+
     iv[niv].settings_id = NGHTTP2_SETTINGS_HEADER_TABLE_SIZE;
     iv[niv].value = config.header_table_size;
     ++niv;
@@ -2426,7 +2434,12 @@ Options:
               remote endpoint as if it  is received in SETTINGS frame.
               The default is large enough as it is seen as unlimited.
   -c, --header-table-size=<SIZE>
-              Specify decoder header table size.
+              Specify decoder  header table  size.  If this  option is
+              used  multiple times,  and the  minimum value  among the
+              given values except  for last one is  strictly less than
+              the last  value, that minimum  value is set  in SETTINGS
+              frame  payload  before  the   last  value,  to  simulate
+              multiple header table size change.
   -b, --padding=<N>
               Add at  most <N>  bytes to a  frame payload  as padding.
               Specify 0 to disable padding.
@@ -2622,6 +2635,8 @@ int main(int argc, char **argv) {
         std::cerr << "-c: Bad option value: " << optarg << std::endl;
         exit(EXIT_FAILURE);
       }
+      config.min_header_table_size =
+          std::min(config.min_header_table_size, config.header_table_size);
       break;
     case '?':
       util::show_candidates(argv[optind - 1], long_options);
diff --git a/src/nghttp.h b/src/nghttp.h
index 64c00b56..e6e054ac 100644
--- a/src/nghttp.h
+++ b/src/nghttp.h
@@ -69,10 +69,11 @@ struct Config {
   std::string datafile;
   std::string harfile;
   nghttp2_option *http2_option;
+  int64_t header_table_size;
+  int64_t min_header_table_size;
   size_t padding;
   size_t max_concurrent_streams;
   ssize_t peer_max_concurrent_streams;
-  ssize_t header_table_size;
   int32_t weight;
   int multiply;
   // milliseconds