trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chen...@apache.org
Subject git commit: TS-287: transaction_active_timeout_in does not trigger on the first request of a Keep-Alive connection.
Date Wed, 21 Aug 2013 03:38:12 GMT
Updated Branches:
  refs/heads/master 6b4aff2ce -> b30d69825


TS-287: transaction_active_timeout_in does not trigger on the first request of a Keep-Alive
connection.

The bug is fixxed by Li Gang(quehan@taobao.com)


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/b30d6982
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/b30d6982
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/b30d6982

Branch: refs/heads/master
Commit: b30d69825bbbc65eeea1123f58f84447a5ebf562
Parents: 6b4aff2
Author: Chen Bin <kuotai@taobao.com>
Authored: Wed Aug 21 11:32:53 2013 +0800
Committer: Chen Bin <kuotai@taobao.com>
Committed: Wed Aug 21 11:32:53 2013 +0800

----------------------------------------------------------------------
 CHANGES                         | 2 ++
 proxy/http/HttpClientSession.cc | 6 ------
 proxy/http/HttpSM.cc            | 1 +
 3 files changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b30d6982/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 9e491c4..5b266e0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,8 @@
 Changes with Apache Traffic Server 3.5.0
 
 
+  *) [TS-287] Fix transaction_active_timeout_in does not trigger on the first request of
a Keep-Alive connection.
+
   *) [TS-2143] Remove alarm email address support (and config).
 
   *) [TS-2136] Fix the first proxy.config.http.accept_no_activity_timeout is invalid.

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b30d6982/proxy/http/HttpClientSession.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpClientSession.cc b/proxy/http/HttpClientSession.cc
index cf7f160..c4d1965 100644
--- a/proxy/http/HttpClientSession.cc
+++ b/proxy/http/HttpClientSession.cc
@@ -151,12 +151,6 @@ HttpClientSession::new_transaction()
   read_state = HCS_ACTIVE_READER;
   current_reader = HttpSM::allocate();
   current_reader->init();
-
-  /////////////////////////
-  // set up timeouts     //
-  /////////////////////////
-  client_vc->set_active_timeout(HRTIME_SECONDS(HttpConfig::m_master.transaction_active_timeout_in));
-
   transact_count++;
   DebugSsn("http_cs", "[%" PRId64 "] Starting transaction %d using sm [%" PRId64 "]", con_id,
transact_count, current_reader->sm_id);
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b30d6982/proxy/http/HttpSM.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc
index 0898843..ba460da 100644
--- a/proxy/http/HttpSM.cc
+++ b/proxy/http/HttpSM.cc
@@ -636,6 +636,7 @@ HttpSM::attach_client_session(HttpClientSession * client_vc, IOBufferReader
* bu
   // set up timeouts     //
   /////////////////////////
   client_vc->get_netvc()->set_inactivity_timeout(HRTIME_SECONDS(HttpConfig::m_master.accept_no_activity_timeout));
+  client_vc->get_netvc()->set_active_timeout(HRTIME_SECONDS(HttpConfig::m_master.transaction_active_timeout_in));
 
   // Add our state sm to the sm list
   state_add_to_list(EVENT_NONE, NULL);


Mime
View raw message