Repository: trafficserver Updated Branches: refs/heads/master 2369a1a49 -> 2dd94936e
Doc: formatting fixes for SPDY documentation. Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/2dd94936 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/2dd94936 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/2dd94936 Branch: refs/heads/master Commit: 2dd94936e9b0cc1e40aaeb6274ad301b2f8bb6b7 Parents: 2369a1a Author: Alan M. Carroll <a...@network-geographics.com> Authored: Thu May 22 08:58:39 2014 -0700 Committer: Alan M. Carroll <a...@network-geographics.com> Committed: Thu May 22 08:58:39 2014 -0700 ---------------------------------------------------------------------- doc/admin/index.en.rst | 2 +- doc/admin/session-protocol.en.rst | 10 +++++----- doc/reference/configuration/records.config.en.rst | 14 +++++++------- 3 files changed, 13 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2dd94936/doc/admin/index.en.rst ---------------------------------------------------------------------- diff --git a/doc/admin/index.en.rst b/doc/admin/index.en.rst index 418d654..3b1229b 100644 --- a/doc/admin/index.en.rst +++ b/doc/admin/index.en.rst @@ -37,7 +37,7 @@ Contents: forward-proxy.en transparent-proxy.en explicit-proxy-caching.en - session-protocols.en + session-protocol.en hierachical-caching.en configuring-cache.en monitoring-traffic.en http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2dd94936/doc/admin/session-protocol.en.rst ---------------------------------------------------------------------- diff --git a/doc/admin/session-protocol.en.rst b/doc/admin/session-protocol.en.rst index b197460..84d7040 100644 --- a/doc/admin/session-protocol.en.rst +++ b/doc/admin/session-protocol.en.rst @@ -22,12 +22,12 @@ Session Protocol Traffic Server supports some session level protocols in place or on top of HTTP. These can be provided by a plugin -(`see<new-protocol-plugins>`) or be one that is supported +(:ref:`see <new-protocol-plugins>`) or be one that is supported directly by Traffic Server. Currently the -`SPDY<http://www.chromium.org/spdy>`_ protocol is the only one current +`SPDY <http://www.chromium.org/spdy>`_ protocol is the only one current supported but it is planned to support HTTP 2 when that is finalized. -Session protocols are specified by explicit names, based on the `NPN<https://technotes.googlecode.com/git/nextprotoneg.html>`_ names. The core supported names are +Session protocols are specified by explicit names, based on the `NPN <https://technotes.googlecode.com/git/nextprotoneg.html>`_ names. The core supported names are * ``http/0.9`` * ``http/1.0`` @@ -46,8 +46,8 @@ The session protocols supported on a proxy port are a subset of these values. Fo * ``spdy`` means ``spdy/3`` and ``spdy/3.1``. * ``http2`` means ``http/2`` -Each proxy port :ref:`can be -configured<proxy.config.http.server_ports>` to support a subset of +Each proxy port can be +configured in :ts:cv:`proxy.config.http.server_ports` to support a subset of these session protocols. For TLS enabled connections this configuration controls which protocols are offered by NPN. For non-TLS proxy ports protocol sniffing is used to determine which protocol is http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2dd94936/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 45734cd..58d7baf 100644 --- a/doc/reference/configuration/records.config.en.rst +++ b/doc/reference/configuration/records.config.en.rst @@ -489,7 +489,7 @@ ssl Not compatible with: ``blind``. proto - Speficy the :ref:`session level protocols<session-protocol>` supported. These should be + Specify the :ref:`session level protocols <session-protocol>` supported. These should be separated by semi-colons. For TLS proxy ports the default value is all available protocols. For non-TLS proxy ports the default is HTTP only. SPDY can be enabled on non-TLS proxy ports but that must be done explicitly. @@ -551,7 +551,7 @@ ip-resolve .. topic:: Example - Listen on port 9090 for TSL enabled SPDY or HTTP connections.:: + Listen on port 9090 for TSL enabled SPDY or HTTP connections, accept no other session protocols.:: 9090:proto=spdy;http:ssl @@ -2248,12 +2248,12 @@ ICP Configuration SPDY Configuration ================== -.. ts:cv:: CONFIG proxy.config.spdy.accept_no_activity_timeout INT 65536 +.. ts:cv:: CONFIG proxy.config.spdy.accept_no_activity_timeout INT 30 :reloadable: How long a SPDY connection will be kept open after an accept without any streams created. -.. ts:cv:: CONFIG proxy.config.spdy.no_activity_timeout_in INT 65536 +.. ts:cv:: CONFIG proxy.config.spdy.no_activity_timeout_in INT 30 :reloadable: How long a stream is kept open without activity. @@ -2263,17 +2263,17 @@ SPDY Configuration The initial window size for inbound connections. -.. ts:cv:: CONFIG proxy.config.spdy.max_concurrent_streams_in INT 1000 +.. ts:cv:: CONFIG proxy.config.spdy.max_concurrent_streams_in INT 100 :reloadable: The maximum number of concurrent streams per inbound connection. .. note:: Reloading this value affects only new SPDY connections, not existing connects. -.. ts:cv:: CONFIG proxy.config.spdy.verbose_in INT 65536 +.. ts:cv:: CONFIG proxy.config.spdy.verbose_in INT 0 :reloadable: - Set the verbose flag for SPDY streams on inbound connections. + Set the verbose flag for SPDY streams on inbound connections. ``0`` means disable, any other value is enable. Scheduled Update Configuration ==============================