From 6c4f2781ff90325822937eeb83cb7ddebca07589 Mon Sep 17 00:00:00 2001 From: Susan Hinrichs Date: Thu, 8 Apr 2021 20:45:23 +0000 Subject: [PATCH] Remove undocumented keepalive_internal_vc setting --- mgmt/RecordsConfig.cc | 4 ---- proxy/http/HttpConfig.cc | 3 --- proxy/http/HttpConfig.h | 1 - proxy/http/HttpTransact.cc | 9 +-------- 4 files changed, 1 insertion(+), 16 deletions(-) diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc index a6041a98688..2da1ee06944 100644 --- a/mgmt/RecordsConfig.cc +++ b/mgmt/RecordsConfig.cc @@ -1223,10 +1223,6 @@ static const RecordElement RecordsConfig[] = {RECT_CONFIG, "proxy.config.plugin.load_elevated", RECD_INT, "0", RECU_RESTART_TS, RR_NULL, RECC_INT, "[0-1]", RECA_READ_ONLY} , - // Interim configuration setting for obeying keepalive requests on internal - // (PluginVC) sessions. See TS-4960 and friends. - {RECT_LOCAL, "proxy.config.http.keepalive_internal_vc", RECD_INT, "0", RECU_DYNAMIC, RR_NULL, RECC_INT, "[0-1]", RECA_NULL}, - //############################################################################## //# //# Local Manager Specific Records File diff --git a/proxy/http/HttpConfig.cc b/proxy/http/HttpConfig.cc index cb8c3b72ae8..016ce7d5acd 100644 --- a/proxy/http/HttpConfig.cc +++ b/proxy/http/HttpConfig.cc @@ -1287,8 +1287,6 @@ HttpConfig::startup() HttpEstablishStaticConfigByte(c.send_100_continue_response, "proxy.config.http.send_100_continue_response"); HttpEstablishStaticConfigByte(c.disallow_post_100_continue, "proxy.config.http.disallow_post_100_continue"); - HttpEstablishStaticConfigByte(c.keepalive_internal_vc, "proxy.config.http.keepalive_internal_vc"); - HttpEstablishStaticConfigByte(c.oride.cache_open_write_fail_action, "proxy.config.http.cache.open_write_fail_action"); HttpEstablishStaticConfigByte(c.oride.cache_when_to_revalidate, "proxy.config.http.cache.when_to_revalidate"); @@ -1564,7 +1562,6 @@ HttpConfig::reconfigure() params->send_100_continue_response = INT_TO_BOOL(m_master.send_100_continue_response); params->disallow_post_100_continue = INT_TO_BOOL(m_master.disallow_post_100_continue); - params->keepalive_internal_vc = INT_TO_BOOL(m_master.keepalive_internal_vc); params->oride.cache_open_write_fail_action = m_master.oride.cache_open_write_fail_action; if (params->oride.cache_open_write_fail_action == CACHE_WL_FAIL_ACTION_READ_RETRY) { diff --git a/proxy/http/HttpConfig.h b/proxy/http/HttpConfig.h index 55a8509dda5..c70ae5463e7 100644 --- a/proxy/http/HttpConfig.h +++ b/proxy/http/HttpConfig.h @@ -806,7 +806,6 @@ struct HttpConfigParams : public ConfigInfo { MgmtByte send_100_continue_response = 0; MgmtByte disallow_post_100_continue = 0; - MgmtByte keepalive_internal_vc = 0; MgmtByte server_session_sharing_pool = TS_SERVER_SESSION_SHARING_POOL_THREAD; diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc index 521ac5721e0..ed24e1ced31 100644 --- a/proxy/http/HttpTransact.cc +++ b/proxy/http/HttpTransact.cc @@ -5655,15 +5655,8 @@ HttpTransact::initialize_state_variables_from_request(State *s, HTTPHdr *obsolet } // If this is an internal request, never keep alive - if (!s->txn_conf->keep_alive_enabled_in) { + if (!s->txn_conf->keep_alive_enabled_in || (vc && vc->get_is_internal_request())) { s->client_info.keep_alive = HTTP_NO_KEEPALIVE; - } else if (vc && vc->get_is_internal_request()) { - // Following the trail of JIRAs back from TS-4960, there can be issues with - // EOS event delivery when using keepalive on internal PluginVC session. As - // an interim measure, if proxy.config.http.keepalive_internal_vc is set, - // we will obey the incoming transaction's keepalive request. - s->client_info.keep_alive = - s->http_config_param->keepalive_internal_vc ? incoming_request->keep_alive_get() : HTTP_NO_KEEPALIVE; } else { s->client_info.keep_alive = incoming_request->keep_alive_get(); }