You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by bc...@apache.org on 2016/11/02 23:20:06 UTC
[trafficserver] branch master updated: Update
keep_alive_no_activity_timeout_in doc and template
This is an automated email from the ASF dual-hosted git repository.
bcall pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new 9df3e5d Update keep_alive_no_activity_timeout_in doc and template
9df3e5d is described below
commit 9df3e5d0ae067f3191f488a9aab70b46c1e9d66b
Author: Masa Sekimura <se...@gmail.com>
AuthorDate: Wed Nov 2 21:10:13 2016 +0000
Update keep_alive_no_activity_timeout_in doc and template
TS-4700 made essential changes to update the default value. There are some
documents and a template for records.config need to be updated.
---
doc/admin-guide/files/records.config.en.rst | 2 +-
doc/admin-guide/performance/index.en.rst | 2 +-
proxy/config/records.config.default.in | 2 +-
proxy/http/HttpConfig.h | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/doc/admin-guide/files/records.config.en.rst b/doc/admin-guide/files/records.config.en.rst
index a02a858..30302f0 100644
--- a/doc/admin-guide/files/records.config.en.rst
+++ b/doc/admin-guide/files/records.config.en.rst
@@ -1230,7 +1230,7 @@ Parent Proxy Configuration
HTTP Connection Timeouts
========================
-.. ts:cv:: CONFIG proxy.config.http.keep_alive_no_activity_timeout_in INT 115
+.. ts:cv:: CONFIG proxy.config.http.keep_alive_no_activity_timeout_in INT 120
:reloadable:
:overridable:
diff --git a/doc/admin-guide/performance/index.en.rst b/doc/admin-guide/performance/index.en.rst
index c988de4..9715509 100644
--- a/doc/admin-guide/performance/index.en.rst
+++ b/doc/admin-guide/performance/index.en.rst
@@ -318,7 +318,7 @@ keepalive timeout which (if set lower) will likely take precedence.
::
- CONFIG proxy.config.http.keep_alive_no_activity_timeout_in INT 115
+ CONFIG proxy.config.http.keep_alive_no_activity_timeout_in INT 120
CONFIG proxy.config.http.keep_alive_no_activity_timeout_out INT 120
Origin Connection Timeouts
diff --git a/proxy/config/records.config.default.in b/proxy/config/records.config.default.in
index 1bd7d24..fee4f6a 100644
--- a/proxy/config/records.config.default.in
+++ b/proxy/config/records.config.default.in
@@ -44,7 +44,7 @@ CONFIG proxy.config.http.uncacheable_requests_bypass_parent INT 1
# HTTP connection timeouts (secs). Docs:
# https://docs.trafficserver.apache.org/records.config#http-connection-timeouts
##############################################################################
-CONFIG proxy.config.http.keep_alive_no_activity_timeout_in INT 115
+CONFIG proxy.config.http.keep_alive_no_activity_timeout_in INT 120
CONFIG proxy.config.http.keep_alive_no_activity_timeout_out INT 120
CONFIG proxy.config.http.transaction_no_activity_timeout_in INT 30
CONFIG proxy.config.http.transaction_no_activity_timeout_out INT 30
diff --git a/proxy/http/HttpConfig.h b/proxy/http/HttpConfig.h
index 6fc33c0..ac40c29 100644
--- a/proxy/http/HttpConfig.h
+++ b/proxy/http/HttpConfig.h
@@ -425,7 +425,7 @@ struct OverridableHttpConfigParams {
cache_guaranteed_min_lifetime(0),
cache_guaranteed_max_lifetime(31536000),
cache_max_stale_age(604800),
- keep_alive_no_activity_timeout_in(115),
+ keep_alive_no_activity_timeout_in(120),
keep_alive_no_activity_timeout_out(120),
transaction_no_activity_timeout_in(30),
transaction_no_activity_timeout_out(30),
--
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>'].