Repository: trafficserver Updated Branches: refs/heads/master 9c6bb37b3 -> fed9e7707
TS-2870 Update SPDY defaults to better match our other defaults Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/fed9e770 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/fed9e770 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/fed9e770 Branch: refs/heads/master Commit: fed9e770790bf63cd0f598a444afe3e765a625a4 Parents: 9c6bb37 Author: Leif Hedstrom <[email protected]> Authored: Tue Jun 3 12:00:43 2014 -0600 Committer: Leif Hedstrom <[email protected]> Committed: Tue Jun 3 12:01:01 2014 -0600 ---------------------------------------------------------------------- CHANGES | 2 ++ mgmt/RecordsConfig.cc | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fed9e770/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 6d8afe7..8be1423 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,8 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 5.0.0 + *) [TS-2870] Update SPDY defaults to better match our other defaults. + *) [TS-2776] Core dump inside openssl library *) [TS-2845] Commit e6b9cb533 causes problems with stats_over_http http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fed9e770/mgmt/RecordsConfig.cc ---------------------------------------------------------------------- diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc index 64b5be4..30b0df7 100644 --- a/mgmt/RecordsConfig.cc +++ b/mgmt/RecordsConfig.cc @@ -1933,11 +1933,11 @@ RecordElement RecordsConfig[] = { //############ {RECT_CONFIG, "proxy.config.spdy.max_concurrent_streams_in", RECD_INT, "100", RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL} , - {RECT_CONFIG, "proxy.config.spdy.no_activity_timeout_in", RECD_INT, "30", RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL} + {RECT_CONFIG, "proxy.config.spdy.no_activity_timeout_in", RECD_INT, "115", RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL} , {RECT_CONFIG, "proxy.config.spdy.initial_window_size_in", RECD_INT, "65536", RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL} , - {RECT_CONFIG, "proxy.config.spdy.accept_no_activity_timeout", RECD_INT, "30", RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL} + {RECT_CONFIG, "proxy.config.spdy.accept_no_activity_timeout", RECD_INT, "120", RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL} , //# Add LOCAL Records Here
