From 15fa38c72fc9ad3bd960223839ad80484cf68750 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Sun, 7 Feb 2016 17:32:34 +0900 Subject: [PATCH] nghttpx: Rename backend_session_cache_per_worker as downstream_session_cache_per_worker --- src/shrpx.cc | 6 +++--- src/shrpx_config.cc | 4 ++-- src/shrpx_config.h | 2 +- src/shrpx_worker.cc | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/shrpx.cc b/src/shrpx.cc index 3f649e82..5ccbc17e 100644 --- a/src/shrpx.cc +++ b/src/shrpx.cc @@ -1071,7 +1071,7 @@ void fill_default_config() { } 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; httpconf.server_name = "nghttpx nghttp2/" NGHTTP2_VERSION; @@ -1591,8 +1591,8 @@ SSL/TLS: --backend-tls-session-cache-per-worker= Set the maximum number of backend TLS session cache stored per worker. - Default: )" << get_config()->tls.backend_session_cache_per_worker - << R"( + Default: )" + << get_config()->tls.downstream_session_cache_per_worker << R"( HTTP/2 and SPDY: -c, --http2-max-concurrent-streams= diff --git a/src/shrpx_config.cc b/src/shrpx_config.cc index 28a0b51b..ed61378f 100644 --- a/src/shrpx_config.cc +++ b/src/shrpx_config.cc @@ -2227,8 +2227,8 @@ int parse_config(const char *opt, const char *optarg, return 0; case SHRPX_OPTID_BACKEND_TLS_SESSION_CACHE_PER_WORKER: - return parse_uint(&mod_config()->tls.backend_session_cache_per_worker, opt, - optarg); + return parse_uint(&mod_config()->tls.downstream_session_cache_per_worker, + opt, optarg); case SHRPX_OPTID_CONF: LOG(WARN) << "conf: ignored"; diff --git a/src/shrpx_config.h b/src/shrpx_config.h index 654da105..614e7a25 100644 --- a/src/shrpx_config.h +++ b/src/shrpx_config.h @@ -393,7 +393,7 @@ struct TLSConfig { std::vector npn_list; // list of supported SSL/TLS protocol strings. std::vector 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 // passed to SSL_CTX_set_options(). long int tls_proto_mask; diff --git a/src/shrpx_worker.cc b/src/shrpx_worker.cc index 748bbd03..2204b9af 100644 --- a/src/shrpx_worker.cc +++ b/src/shrpx_worker.cc @@ -311,7 +311,7 @@ void Worker::cache_downstream_tls_session(const DownstreamAddr *addr, SSL_SESSION *session) { auto &tlsconf = get_config()->tls; - auto max = tlsconf.backend_session_cache_per_worker; + auto max = tlsconf.downstream_session_cache_per_worker; if (max == 0) { return; }