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 2015/09/11 23:25:37 UTC
[2/3] trafficserver git commit: TS-3907: Configuration cleanup for
6.0.0 release
TS-3907: Configuration cleanup for 6.0.0 release
(cherry picked from commit 00b697d899f3fd87d6d891fd46dda804d4680c70)
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/ebe3c146
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/ebe3c146
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/ebe3c146
Branch: refs/heads/6.0.x
Commit: ebe3c146ed1fc035f8933459f166fe7e49e75689
Parents: 3e723df
Author: Bryan Call <bc...@apache.org>
Authored: Fri Sep 11 14:20:25 2015 -0700
Committer: Bryan Call <bc...@apache.org>
Committed: Fri Sep 11 14:21:59 2015 -0700
----------------------------------------------------------------------
mgmt/RecordsConfig.cc | 2 +-
proxy/config/records.config.default.in | 8 ++++++++
2 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ebe3c146/mgmt/RecordsConfig.cc
----------------------------------------------------------------------
diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc
index abf4b8f..8eb21b1 100644
--- a/mgmt/RecordsConfig.cc
+++ b/mgmt/RecordsConfig.cc
@@ -194,7 +194,7 @@ static const RecordElement RecordsConfig[] =
,
{RECT_CONFIG, "proxy.config.diags.action.tags", RECD_STRING, NULL, RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
- {RECT_CONFIG, "proxy.config.diags.show_location", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ {RECT_CONFIG, "proxy.config.diags.show_location", RECD_INT, "1", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
{RECT_CONFIG, "proxy.config.diags.output.diag", RECD_STRING, "E", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ebe3c146/proxy/config/records.config.default.in
----------------------------------------------------------------------
diff --git a/proxy/config/records.config.default.in b/proxy/config/records.config.default.in
index b8837d5..357d863 100644
--- a/proxy/config/records.config.default.in
+++ b/proxy/config/records.config.default.in
@@ -25,6 +25,12 @@ CONFIG proxy.config.exec_thread.affinity INT 1
CONFIG proxy.config.http.server_ports STRING 8080
##############################################################################
+# Enable HTTP/2 Support. Docs:
+# https://docs.trafficserver.apache.org/records.config#http-2-configuration
+##############################################################################
+CONFIG proxy.config.http2.enabled INT 0
+
+##############################################################################
# Via: headers. Docs:
# https://docs.trafficserver.apache.org/records.config#proxy-config-http-insert-response-via-str
##############################################################################
@@ -120,6 +126,8 @@ CONFIG proxy.config.http.cache.heuristic_lm_factor FLOAT 0.10
# https://docs.trafficserver.apache.org/records.config#network
##############################################################################
CONFIG proxy.config.net.connections_throttle INT 30000
+CONFIG proxy.config.net.max_connections_in INT 30000
+CONFIG proxy.config.net.max_connections_active_in INT 10000
##############################################################################
# RAM and disk cache configurations. Docs: