trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chen...@apache.org
Subject git commit: TS-2136: Fix the first proxy.config.http.accept_no_activity_timeout is invalid.
Date Tue, 20 Aug 2013 07:18:06 GMT
Updated Branches:
  refs/heads/master c637fde07 -> 9d7e82121


TS-2136: Fix the first proxy.config.http.accept_no_activity_timeout is invalid.


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

Branch: refs/heads/master
Commit: 9d7e82121dd729b3e9f9956ff24e25bbdf773327
Parents: c637fde
Author: Chen Bin <kuotai@taobao.com>
Authored: Tue Aug 20 15:04:04 2013 +0800
Committer: Chen Bin <kuotai@taobao.com>
Committed: Tue Aug 20 15:04:44 2013 +0800

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


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9d7e8212/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 435b321..2dd6d26 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,8 @@
 Changes with Apache Traffic Server 3.5.0
 
 
+  *) [TS-2136] Fix the first proxy.config.http.accept_no_activity_timeout is invalid.
+
   *) [TS-2127] Move hostdb.config to var/trafficserver, together with with the
    host.db itself.
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9d7e8212/proxy/http/HttpClientSession.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpClientSession.cc b/proxy/http/HttpClientSession.cc
index 2601242..cf7f160 100644
--- a/proxy/http/HttpClientSession.cc
+++ b/proxy/http/HttpClientSession.cc
@@ -155,10 +155,6 @@ HttpClientSession::new_transaction()
   /////////////////////////
   // set up timeouts     //
   /////////////////////////
-  DebugSsn("http_cs", "[%" PRId64 "] using accept inactivity timeout [%" PRId64" seconds]",
-        con_id, HttpConfig::m_master.accept_no_activity_timeout);
-  client_vc->set_inactivity_timeout(HRTIME_SECONDS(HttpConfig::m_master.accept_no_activity_timeout));
-
   client_vc->set_active_timeout(HRTIME_SECONDS(HttpConfig::m_master.transaction_active_timeout_in));
 
   transact_count++;

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9d7e8212/proxy/http/HttpSM.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc
index 7bba241..0898843 100644
--- a/proxy/http/HttpSM.cc
+++ b/proxy/http/HttpSM.cc
@@ -632,6 +632,11 @@ HttpSM::attach_client_session(HttpClientSession * client_vc, IOBufferReader
* bu
   //  so if we get an timeout events the sm handles them
   ua_entry->read_vio = client_vc->do_io_read(this, 0, buffer_reader->mbuf);
 
+  /////////////////////////
+  // set up timeouts     //
+  /////////////////////////
+  client_vc->get_netvc()->set_inactivity_timeout(HRTIME_SECONDS(HttpConfig::m_master.accept_no_activity_timeout));
+
   // Add our state sm to the sm list
   state_add_to_list(EVENT_NONE, NULL);
 }


Mime
View raw message