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

nghttpx: Rename backend_session_cache_per_worker as downstream_session_cache_per_worker

This commit is contained in:
Tatsuhiro Tsujikawa 2016-02-07 17:32:34 +09:00
parent e7de5e9f6c
commit 15fa38c72f
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/shrpx.cc
View File

@ -1071,7 +1071,7 @@ void fill_default_config() {
} }
tlsconf.session_timeout = std::chrono::hours(12); tlsconf.session_timeout = std::chrono::hours(12);
tlsconf.backend_session_cache_per_worker = 10000; tlsconf.downstream_session_cache_per_worker = 10000;
auto &httpconf = mod_config()->http; auto &httpconf = mod_config()->http;
httpconf.server_name = "nghttpx nghttp2/" NGHTTP2_VERSION; httpconf.server_name = "nghttpx nghttp2/" NGHTTP2_VERSION;
@ -1591,8 +1591,8 @@ SSL/TLS:
--backend-tls-session-cache-per-worker=<N> --backend-tls-session-cache-per-worker=<N>
Set the maximum number of backend TLS session cache Set the maximum number of backend TLS session cache
stored per worker. stored per worker.
Default: )" << get_config()->tls.backend_session_cache_per_worker Default: )"
<< R"( << get_config()->tls.downstream_session_cache_per_worker << R"(
HTTP/2 and SPDY: HTTP/2 and SPDY:
-c, --http2-max-concurrent-streams=<N> -c, --http2-max-concurrent-streams=<N>

4
src/shrpx_config.cc
View File

@ -2227,8 +2227,8 @@ int parse_config(const char *opt, const char *optarg,
return 0; return 0;
case SHRPX_OPTID_BACKEND_TLS_SESSION_CACHE_PER_WORKER: case SHRPX_OPTID_BACKEND_TLS_SESSION_CACHE_PER_WORKER:
return parse_uint(&mod_config()->tls.backend_session_cache_per_worker, opt, return parse_uint(&mod_config()->tls.downstream_session_cache_per_worker,
optarg); opt, optarg);
case SHRPX_OPTID_CONF: case SHRPX_OPTID_CONF:
LOG(WARN) << "conf: ignored"; LOG(WARN) << "conf: ignored";

2
src/shrpx_config.h
View File

@ -393,7 +393,7 @@ struct TLSConfig {
std::vector<std::string> npn_list; std::vector<std::string> npn_list;
// list of supported SSL/TLS protocol strings. // list of supported SSL/TLS protocol strings.
std::vector<std::string> tls_proto_list; std::vector<std::string> tls_proto_list;
size_t backend_session_cache_per_worker; size_t downstream_session_cache_per_worker;
// Bit mask to disable SSL/TLS protocol versions. This will be // Bit mask to disable SSL/TLS protocol versions. This will be
// passed to SSL_CTX_set_options(). // passed to SSL_CTX_set_options().
long int tls_proto_mask; long int tls_proto_mask;

2
src/shrpx_worker.cc
View File

@ -311,7 +311,7 @@ void Worker::cache_downstream_tls_session(const DownstreamAddr *addr,
SSL_SESSION *session) { SSL_SESSION *session) {
auto &tlsconf = get_config()->tls; auto &tlsconf = get_config()->tls;
auto max = tlsconf.backend_session_cache_per_worker; auto max = tlsconf.downstream_session_cache_per_worker;
if (max == 0) { if (max == 0) {
return; return;
} }