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

Option value fixes. 

Set -n default value to 1. Show missing default values.  Use -c value
in SPDY session.
This commit is contained in:
Tatsuhiro Tsujikawa 2012-06-07 02:09:59 +09:00
parent 673f9c7df0
commit 5f5fb18b77
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
examples/shrpx.cc
View File

@ -253,7 +253,7 @@ void fill_default_config()
mod_config()->downstream_host = "localhost"; mod_config()->downstream_host = "localhost";
mod_config()->downstream_port = 80; mod_config()->downstream_port = 80;
mod_config()->num_worker = 4; mod_config()->num_worker = 1;
mod_config()->spdy_max_concurrent_streams = mod_config()->spdy_max_concurrent_streams =
SPDYLAY_INITIAL_MAX_CONCURRENT_STREAMS; SPDYLAY_INITIAL_MAX_CONCURRENT_STREAMS;
@ -319,12 +319,17 @@ void print_help(std::ostream& out)
<< get_config()->host << "," << get_config()->port << "'\n" << get_config()->host << "," << get_config()->port << "'\n"
<< " -n, --workers=<CORES>\n" << " -n, --workers=<CORES>\n"
<< " Set the number of worker threads.\n" << " Set the number of worker threads.\n"
<< " Default: "
<< get_config()->num_worker << "\n"
<< " -c, --spdy-max-concurrent-streams=<NUM>\n" << " -c, --spdy-max-concurrent-streams=<NUM>\n"
<< " Set the maximum number of the concurrent\n" << " Set the maximum number of the concurrent\n"
<< " streams in one SPDY session.\n" << " streams in one SPDY session.\n"
<< " Default: "
<< get_config()->spdy_max_concurrent_streams << "\n"
<< " -L, --log-level=<LEVEL>\n" << " -L, --log-level=<LEVEL>\n"
<< " Set the severity level of log output.\n" << " Set the severity level of log output.\n"
<< " INFO, WARNING, ERROR and FATAL\n" << " INFO, WARNING, ERROR and FATAL.\n"
<< " Default: WARNING\n"
<< " -D, --daemon Run in a background. If -D is used, the\n" << " -D, --daemon Run in a background. If -D is used, the\n"
<< " current working directory is changed to '/'.\n" << " current working directory is changed to '/'.\n"
<< " -h, --help Print this help.\n" << " -h, --help Print this help.\n"

2
examples/shrpx_spdy_upstream.cc
View File

@ -223,7 +223,7 @@ SpdyUpstream::SpdyUpstream(uint16_t version, ClientHandler *handler)
// TODO Maybe call from outside? // TODO Maybe call from outside?
spdylay_settings_entry entry; spdylay_settings_entry entry;
entry.settings_id = SPDYLAY_SETTINGS_MAX_CONCURRENT_STREAMS; entry.settings_id = SPDYLAY_SETTINGS_MAX_CONCURRENT_STREAMS;
entry.value = SPDYLAY_INITIAL_MAX_CONCURRENT_STREAMS; entry.value = get_config()->spdy_max_concurrent_streams;
entry.flags = SPDYLAY_ID_FLAG_SETTINGS_NONE; entry.flags = SPDYLAY_ID_FLAG_SETTINGS_NONE;
rv = spdylay_submit_settings(session_, SPDYLAY_FLAG_SETTINGS_NONE, rv = spdylay_submit_settings(session_, SPDYLAY_FLAG_SETTINGS_NONE,
&entry, 1); &entry, 1);