From c731d1fea576d9bba5b2d955006457d0cbede972 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Sat, 27 Feb 2016 23:44:35 +0900 Subject: [PATCH] nghttpx: Deprecate --backend-http2-connections-per-worker option --- src/shrpx.cc | 9 --------- src/shrpx_config.cc | 4 ++-- src/shrpx_config.h | 1 - 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/shrpx.cc b/src/shrpx.cc index 7da056a3..e0e38688 100644 --- a/src/shrpx.cc +++ b/src/shrpx.cc @@ -1352,15 +1352,6 @@ Performance: accepts. Setting 0 means unlimited. Default: )" << get_config()->conn.upstream.worker_connections << R"( - --backend-http2-connections-per-worker= - Set maximum number of backend HTTP/2 physical - connections per worker. If pattern is used in -b - option, this limit is applied to each pattern group (in - other words, each pattern group can have maximum - HTTP/2 connections). The default value is 0, which - means that the value is adjusted to the number of - backend addresses. If pattern is used, this adjustment - is done for each pattern group. --backend-http1-connections-per-host= Set maximum number of backend concurrent HTTP/1 connections per origin host. This option is meaningful diff --git a/src/shrpx_config.cc b/src/shrpx_config.cc index 8b5cc537..7cb19d9f 100644 --- a/src/shrpx_config.cc +++ b/src/shrpx_config.cc @@ -2077,8 +2077,8 @@ int parse_config(const char *opt, const char *optarg, return 0; case SHRPX_OPTID_BACKEND_HTTP2_CONNECTIONS_PER_WORKER: - return parse_uint(&mod_config()->http2.downstream.connections_per_worker, - opt, optarg); + LOG(WARN) << opt << ": deprecated."; + return 0; case SHRPX_OPTID_FETCH_OCSP_RESPONSE_FILE: mod_config()->tls.ocsp.fetch_ocsp_response_file = optarg; diff --git a/src/shrpx_config.h b/src/shrpx_config.h index 10742685..69d807f4 100644 --- a/src/shrpx_config.h +++ b/src/shrpx_config.h @@ -485,7 +485,6 @@ struct Http2Config { nghttp2_session_callbacks *callbacks; size_t window_bits; size_t connection_window_bits; - size_t connections_per_worker; } downstream; struct { ev_tstamp stream_read;