Repository: trafficserver Updated Branches: refs/heads/master 8861a399c -> b711dd38a
Revert "TS-3312: KA timeout to origin does not seem to honor configurations" This reverts commit 9acfba0a911c374c5fb1c4171d0041ebeafd3f33. There's a discussion on the Jira, I think we can improve on this. Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/fab096ed Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/fab096ed Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/fab096ed Branch: refs/heads/master Commit: fab096ed2f7789dc2d007791f44504d5fd21833b Parents: 8861a39 Author: Leif Hedstrom <[email protected]> Authored: Thu Mar 12 14:59:40 2015 -0600 Committer: Leif Hedstrom <[email protected]> Committed: Thu Mar 12 14:59:40 2015 -0600 ---------------------------------------------------------------------- proxy/http/HttpSessionManager.cc | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fab096ed/proxy/http/HttpSessionManager.cc ---------------------------------------------------------------------- diff --git a/proxy/http/HttpSessionManager.cc b/proxy/http/HttpSessionManager.cc index c650ab6..101955b 100644 --- a/proxy/http/HttpSessionManager.cc +++ b/proxy/http/HttpSessionManager.cc @@ -120,14 +120,8 @@ ServerSessionPool::releaseSession(HttpServerSession* ss) // Transfer control of the write side as well ss->do_io_write(this, 0, NULL); - HttpConfigParams *http_config_params = HttpConfig::acquire(); - - // when placing the session to the shared pool we have to set the time out to - // keep_alive_no_activity_timeout_out and not to transaction_no_activity_timeout_out, - // since there is no transaction pending at this point. - // Once there is an active transaction on this connection, inactivity timeout will be - // overwritten to transaction_no_activity_timeout_out - ss->get_netvc()->set_inactivity_timeout(HRTIME_SECONDS(http_config_params->oride.keep_alive_no_activity_timeout_out)); + // we probably don't need the active timeout set, but will leave it for now + ss->get_netvc()->set_inactivity_timeout(ss->get_netvc()->get_inactivity_timeout()); ss->get_netvc()->set_active_timeout(ss->get_netvc()->get_active_timeout()); // put it in the pools. m_ip_pool.insert(ss);
