walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

nghttp: Allow multiple -c option occurrence, and take min and last value

This commit is contained in:
Tatsuhiro Tsujikawa 2015-10-24 18:11:47 +09:00
parent 62a8132c02
commit d1b8f60776
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/nghttp.cc
View File

@ -94,13 +94,15 @@ constexpr auto anchors = std::array<Anchor, 5>{{
} // namespace } // namespace
Config::Config() 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), peer_max_concurrent_streams(NGHTTP2_INITIAL_MAX_CONCURRENT_STREAMS),
header_table_size(-1), weight(NGHTTP2_DEFAULT_WEIGHT), multiply(1), weight(NGHTTP2_DEFAULT_WEIGHT), multiply(1), timeout(0.), window_bits(-1),
timeout(0.), window_bits(-1), connection_window_bits(-1), verbose(0), connection_window_bits(-1), verbose(0), null_out(false),
null_out(false), remote_name(false), get_assets(false), stat(false), remote_name(false), get_assets(false), stat(false), upgrade(false),
upgrade(false), continuation(false), no_content_length(false), continuation(false), no_content_length(false), no_dep(false),
no_dep(false), hexdump(false), no_push(false) { hexdump(false), no_push(false) {
nghttp2_option_new(&http2_option); nghttp2_option_new(&http2_option);
nghttp2_option_set_peer_max_concurrent_streams(http2_option, nghttp2_option_set_peer_max_concurrent_streams(http2_option,
peer_max_concurrent_streams); peer_max_concurrent_streams);
@ -768,6 +770,12 @@ size_t populate_settings(nghttp2_settings_entry *iv) {
} }
if (config.header_table_size >= 0) { 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].settings_id = NGHTTP2_SETTINGS_HEADER_TABLE_SIZE;
iv[niv].value = config.header_table_size; iv[niv].value = config.header_table_size;
++niv; ++niv;
@ -2426,7 +2434,12 @@ Options:
remote endpoint as if it is received in SETTINGS frame. remote endpoint as if it is received in SETTINGS frame.
The default is large enough as it is seen as unlimited. The default is large enough as it is seen as unlimited.
-c, --header-table-size=<SIZE> -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> -b, --padding=<N>
Add at most <N> bytes to a frame payload as padding. Add at most <N> bytes to a frame payload as padding.
Specify 0 to disable 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; std::cerr << "-c: Bad option value: " << optarg << std::endl;
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
config.min_header_table_size =
std::min(config.min_header_table_size, config.header_table_size);
break; break;
case '?': case '?':
util::show_candidates(argv[optind - 1], long_options); util::show_candidates(argv[optind - 1], long_options);

3
src/nghttp.h
View File

@ -69,10 +69,11 @@ struct Config {
std::string datafile; std::string datafile;
std::string harfile; std::string harfile;
nghttp2_option *http2_option; nghttp2_option *http2_option;
int64_t header_table_size;
int64_t min_header_table_size;
size_t padding; size_t padding;
size_t max_concurrent_streams; size_t max_concurrent_streams;
ssize_t peer_max_concurrent_streams; ssize_t peer_max_concurrent_streams;
ssize_t header_table_size;
int32_t weight; int32_t weight;
int multiply; int multiply;
// milliseconds // milliseconds