You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2014/01/03 18:19:17 UTC
[46/50] git commit: Added TS-1365 to CHANGES,
fixed default config value in docs
Added TS-1365 to CHANGES, fixed default config value in docs
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/f78c83a8
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/f78c83a8
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/f78c83a8
Branch: refs/heads/5.0.x
Commit: f78c83a82d6eb6f2bfc23fc86ceb430121548049
Parents: 037d8cc
Author: Leif Hedstrom <zw...@apache.org>
Authored: Thu Jan 2 15:33:47 2014 -0700
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Thu Jan 2 15:33:47 2014 -0700
----------------------------------------------------------------------
CHANGES | 6 ++++++
doc/reference/configuration/records.config.en.rst | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f78c83a8/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 6d01fca..7e4ae1e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,12 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 4.2.0
+ *) [TS-1365] Add a new configuration option, proxy.config.net.poll_timeout,
+ with the same behavior as the command line option --poll_timeout. Also
+ adjust AIO scheduling to correlate to this setting, to avoid additional
+ CPU load. Note that this configuration is generally not necessary to
+ configure, unless you are concerned with system idle CPU consumption.
+
*) [TS-2468] Bring back the load balancer plugin.
*) [TS-2465] libxml2 detection generates an invalid linker path.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f78c83a8/doc/reference/configuration/records.config.en.rst
----------------------------------------------------------------------
diff --git a/doc/reference/configuration/records.config.en.rst b/doc/reference/configuration/records.config.en.rst
index 08aaf1a..79e4975 100644
--- a/doc/reference/configuration/records.config.en.rst
+++ b/doc/reference/configuration/records.config.en.rst
@@ -2225,7 +2225,7 @@ Sockets
Same as the command line option ``--accept_mss`` that sets the MSS for all incoming requests.
-.. ts:cv:: CONFIG proxy.config.net.poll_timeout INT 0
+.. ts:cv:: CONFIG proxy.config.net.poll_timeout INT 10 (or 30 on Solaris)
Same as the command line option ``--poll_timeout``, or ``-t``, which
specifies the timeout used for the polling mechanism used. This timeout is