Repository: trafficserver Updated Branches: refs/heads/master f84bfd814 -> c25fb7541
TS-2821 Add SPDY configuration for max concurrent streams per inbound connection. Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/c25fb754 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/c25fb754 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/c25fb754 Branch: refs/heads/master Commit: c25fb7541431546d23a98b3af14531b7eb3b38aa Parents: f84bfd8 Author: Alan M. Carroll <[email protected]> Authored: Mon May 19 17:12:03 2014 -0700 Committer: Alan M. Carroll <[email protected]> Committed: Mon May 19 17:12:03 2014 -0700 ---------------------------------------------------------------------- CHANGES | 2 ++ doc/reference/configuration/records.config.en.rst | 8 ++++++++ mgmt/RecordsConfig.cc | 7 +++++++ proxy/spdy/SpdyCommon.cc | 3 ++- proxy/spdy/SpdyCommon.h | 2 +- 5 files changed, 20 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c25fb754/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index f639d8d..7c9bfc5 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,8 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 5.0.0 + *) [TS-2821] Added configuration for max concurrent streams for SPDY. + *) [TS-2558] Remove check for inbound transparency vs. SSL. *) [TS-2810] Add the TSVConnFdCreate API. http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c25fb754/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 7a9a05a..4ca5613 100644 --- a/doc/reference/configuration/records.config.en.rst +++ b/doc/reference/configuration/records.config.en.rst @@ -2224,6 +2224,14 @@ ICP Configuration Specifies the timeout used for ICP queries. +SPDY Configuration +================== + +.. ts:cv:: CONFIG proxy.config.spdy.max_concurrent_streams INT 1000 + :reloadable: + + Set the maximum number of concurrent streams per client SPDY connection. + Scheduled Update Configuration ============================== http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c25fb754/mgmt/RecordsConfig.cc ---------------------------------------------------------------------- diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc index a6458dd..0551ec4 100644 --- a/mgmt/RecordsConfig.cc +++ b/mgmt/RecordsConfig.cc @@ -1929,6 +1929,13 @@ RecordElement RecordsConfig[] = { {RECT_LOCAL, "proxy.local.http.parent_proxy.disable_connect_tunneling", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL} , + //############ + //# + //# SPDY global configuration. + //# + //############ + {RECT_CONFIG, "proxy.config.spdy.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/c25fb754/proxy/spdy/SpdyCommon.cc ---------------------------------------------------------------------- diff --git a/proxy/spdy/SpdyCommon.cc b/proxy/spdy/SpdyCommon.cc index 65f5cfc..66086ef 100644 --- a/proxy/spdy/SpdyCommon.cc +++ b/proxy/spdy/SpdyCommon.cc @@ -49,7 +49,8 @@ spdy_config_load() // http server, unless '--port' is given. // SPDY_CFG.spdy.serv_port = -1; - SPDY_CFG.spdy.max_concurrent_streams = 1000; +// SPDY_CFG.spdy.max_concurrent_streams = 1000; + REC_EstablishStaticConfigInt32(SPDY_CFG.spdy.max_concurrent_streams, "proxy.config.spdy.max_concurrent_streams"); SPDY_CFG.spdy.initial_window_size = (64 << 10); spdy_callbacks_init(&SPDY_CFG.spdy.callbacks); http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c25fb754/proxy/spdy/SpdyCommon.h ---------------------------------------------------------------------- diff --git a/proxy/spdy/SpdyCommon.h b/proxy/spdy/SpdyCommon.h index 50d8fa4..33bab9a 100644 --- a/proxy/spdy/SpdyCommon.h +++ b/proxy/spdy/SpdyCommon.h @@ -60,7 +60,7 @@ struct SpdyConfig { bool enable_tls; bool keep_host_port; int serv_port; - int max_concurrent_streams; + int32_t max_concurrent_streams; int initial_window_size; spdylay_session_callbacks callbacks; };
