From 755017c9e08d3f1973002e78da9862dd4b3c1924 Mon Sep 17 00:00:00 2001 From: Susan Hinrichs Date: Fri, 9 Aug 2019 20:27:49 +0000 Subject: [PATCH] Fix no_activity timeout for server session reuse. --- proxy/http/HttpSM.cc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc index 10b82e6342b..39886ceb322 100644 --- a/proxy/http/HttpSM.cc +++ b/proxy/http/HttpSM.cc @@ -5994,6 +5994,13 @@ HttpSM::setup_server_send_request() milestones[TS_MILESTONE_SERVER_BEGIN_WRITE] = Thread::get_hrtime(); server_entry->write_vio = server_entry->vc->do_io_write(this, hdr_length, buf_start); + + // Make sure the VC is using correct timeouts. We may be reusing a previously used server session + if (t_state.api_txn_no_activity_timeout_value != -1) { + server_session->get_netvc()->set_inactivity_timeout(HRTIME_MSECONDS(t_state.api_txn_no_activity_timeout_value)); + } else { + server_session->get_netvc()->set_inactivity_timeout(HRTIME_SECONDS(t_state.txn_conf->transaction_no_activity_timeout_out)); + } } void