Repository: trafficserver Updated Branches: refs/heads/master c25fb7541 -> ce8304309
TS-2821 Add to default records.config and tweak the name to be more consistent. Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/ce830430 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/ce830430 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/ce830430 Branch: refs/heads/master Commit: ce8304309e2c17b4b3efbe93f990f7106a28a7e1 Parents: c25fb75 Author: Alan M. Carroll <[email protected]> Authored: Mon May 19 17:25:29 2014 -0700 Committer: Alan M. Carroll <[email protected]> Committed: Mon May 19 17:25:29 2014 -0700 ---------------------------------------------------------------------- doc/reference/configuration/records.config.en.rst | 4 ++-- mgmt/RecordsConfig.cc | 2 +- proxy/config/records.config.default.in | 6 ++++++ proxy/spdy/SpdyCommon.cc | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ce830430/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 4ca5613..cef38fe 100644 --- a/doc/reference/configuration/records.config.en.rst +++ b/doc/reference/configuration/records.config.en.rst @@ -2227,10 +2227,10 @@ ICP Configuration SPDY Configuration ================== -.. ts:cv:: CONFIG proxy.config.spdy.max_concurrent_streams INT 1000 +.. ts:cv:: CONFIG proxy.config.spdy.client.max_concurrent_streams INT 1000 :reloadable: - Set the maximum number of concurrent streams per client SPDY connection. + Set the maximum number of concurrent streams per client connection. Scheduled Update Configuration ============================== http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ce830430/mgmt/RecordsConfig.cc ---------------------------------------------------------------------- diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc index 0551ec4..f46a5b8 100644 --- a/mgmt/RecordsConfig.cc +++ b/mgmt/RecordsConfig.cc @@ -1934,7 +1934,7 @@ RecordElement RecordsConfig[] = { //# SPDY global configuration. //# //############ - {RECT_CONFIG, "proxy.config.spdy.max_concurrent_streams", RECD_INT, "1000", RECU_DYNAMIC, RR_NULL, RECC_INT, NULL, RECA_NULL}, + {RECT_CONFIG, "proxy.config.spdy.client.max_concurrent_streams", RECD_INT, "1000", RECU_DYNAMIC, RR_NULL, RECC_INT, NULL, RECA_NULL}, //# Add LOCAL Records Here {RECT_LOCAL, "proxy.local.incoming_ip_to_bind", RECD_STRING, NULL, RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL} http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ce830430/proxy/config/records.config.default.in ---------------------------------------------------------------------- diff --git a/proxy/config/records.config.default.in b/proxy/config/records.config.default.in index 22a2587..3445a24 100644 --- a/proxy/config/records.config.default.in +++ b/proxy/config/records.config.default.in @@ -541,6 +541,12 @@ CONFIG proxy.config.ssl.client.CA.cert.filename STRING NULL CONFIG proxy.config.ssl.client.CA.cert.path STRING @rel_sysconfdir@ ############################################################################## # +# SPDY Configuration. +# +############################################################################## +CONFIG proxy.config.spdy.client.max_concurrent_streams INT 1000 +############################################################################## +# # ICP Configuration. # ############################################################################## http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ce830430/proxy/spdy/SpdyCommon.cc ---------------------------------------------------------------------- diff --git a/proxy/spdy/SpdyCommon.cc b/proxy/spdy/SpdyCommon.cc index 66086ef..58ba1d9 100644 --- a/proxy/spdy/SpdyCommon.cc +++ b/proxy/spdy/SpdyCommon.cc @@ -50,7 +50,7 @@ spdy_config_load() // SPDY_CFG.spdy.serv_port = -1; // SPDY_CFG.spdy.max_concurrent_streams = 1000; - REC_EstablishStaticConfigInt32(SPDY_CFG.spdy.max_concurrent_streams, "proxy.config.spdy.max_concurrent_streams"); + REC_EstablishStaticConfigInt32(SPDY_CFG.spdy.max_concurrent_streams, "proxy.config.spdy.client.max_concurrent_streams"); SPDY_CFG.spdy.initial_window_size = (64 << 10); spdy_callbacks_init(&SPDY_CFG.spdy.callbacks);
