This is an automated email from the ASF dual-hosted git repository.
sorber pushed a commit to branch 6.2.x
in repository https://git-dual.apache.org/repos/asf/trafficserver.git
commit 0d2214f022e3a27a28fde6f7e6f50370fa828d8e
Author: Leif Hedstrom <zw...@apache.org>
AuthorDate: Mon Apr 18 19:28:01 2016 -0600
TS-4359 Deprecate the SPDY feature
This marks the configuration options for SPDY as deprecated, as well
as the help text for the SPDY option in configure.ac.
(cherry picked from commit 9ebed0b37afe377151ac9e99adb24d8f158bdace)
---
configure.ac | 2 +-
doc/admin-guide/configuration/session-protocol.en.rst | 13 +++----------
doc/admin-guide/files/records.config.en.rst | 11 ++++++++---
doc/admin-guide/installation/index.en.rst | 4 +++-
4 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/configure.ac b/configure.ac
index 3d38e7d..bee20f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -355,7 +355,7 @@ AC_MSG_RESULT([$enable_tproxy])
#
AC_MSG_CHECKING([whether to enable spdy])
AC_ARG_ENABLE([spdy],
- [AS_HELP_STRING([--enable-spdy], [turn on spdy protocol])],
+ [AS_HELP_STRING([--enable-spdy], [turn on spdy protocol
[DEPRECATED!]])],
[],
[enable_spdy="no"])
AC_MSG_RESULT([$enable_spdy])
diff --git a/doc/admin-guide/configuration/session-protocol.en.rst
b/doc/admin-guide/configuration/session-protocol.en.rst
index bbaf33e..de14cae 100644
--- a/doc/admin-guide/configuration/session-protocol.en.rst
+++ b/doc/admin-guide/configuration/session-protocol.en.rst
@@ -24,13 +24,10 @@ Session Protocol
|TS| supports some session level protocols in place of or on top of HTTP. These
can be provided by a plugin (see :ref:`developer-plugins-new-protocol-plugins`)
-or be one that is supported directly by |TS|. The
-`SPDY <http://www.chromium.org/spdy>`_ protocol is the only one currently
-supported, but it is planned to support HTTP 2 when that is finalized.
+or be one that is supported directly by |TS|. Note that the SPDY protocol is
+deprecated as of v6.2.0, and will be removed in v7.0.0.
-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:
* ``http/0.9``
* ``http/1.0``
@@ -41,10 +38,6 @@ core supported names are:
* ``spdy/3``
* ``spdy/3.1``
-The ``http/2`` value is not currently functional, but is included for future
-use. Both ``spdy/1`` and ``spdy/2`` are obsolete, but are include for
-completeness.
-
The session protocols supported on a proxy port are a subset of these values.
For convenience some pseudo-values are defined in terms of these fundamental
protocols:
diff --git a/doc/admin-guide/files/records.config.en.rst
b/doc/admin-guide/files/records.config.en.rst
index d356cb1..da23cb6 100644
--- a/doc/admin-guide/files/records.config.en.rst
+++ b/doc/admin-guide/files/records.config.en.rst
@@ -610,7 +610,7 @@ proto
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.
+ only.
tr-full
Fully transparent. This is a convenience option and is identical to
specifying both ``tr-in`` and ``tr-out``.
@@ -669,9 +669,9 @@ ip-resolve
.. topic:: Example
- Listen on port 9090 for TSL enabled SPDY or HTTP connections, accept no
other session protocols.::
+ Listen on port 9090 for TSL enabled HTTP/2 or HTTP connections, accept no
other session protocols.::
- 9090:proto=spdy;http:ssl
+ 9090:proto=http2;http:ssl
.. ts:cv:: CONFIG proxy.config.http.connect_ports STRING 443 563
@@ -3000,23 +3000,28 @@ HTTP/2 Configuration
SPDY Configuration
==================
+
.. ts:cv:: CONFIG proxy.config.spdy.accept_no_activity_timeout INT 120
:reloadable:
+ :deprecated:
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 115
:reloadable:
+ :deprecated:
How long a stream is kept open without activity.
.. ts:cv:: CONFIG proxy.config.spdy.initial_window_size_in INT 1048576
:reloadable:
+ :deprecated:
The initial window size for inbound connections.
.. ts:cv:: CONFIG proxy.config.spdy.max_concurrent_streams_in INT 100
:reloadable:
+ :deprecated:
The maximum number of concurrent streams per inbound connection.
diff --git a/doc/admin-guide/installation/index.en.rst
b/doc/admin-guide/installation/index.en.rst
index 2c933f9..2255c80 100644
--- a/doc/admin-guide/installation/index.en.rst
+++ b/doc/admin-guide/installation/index.en.rst
@@ -196,7 +196,9 @@ Adding SPDY Support
-------------------
Traffic Server v5.0.x and above are capable of supporting SPDY, but it is
-optional and must be explicitly configured during the build process.
+optional and must be explicitly configured during the build process. The
+support of SPDY is deprecated as of ATS v6.2.0, and will be removed in
+v7.0.0.
#. Clone the spdylay Git repository from tatsuhiro. ::
--
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <commits@trafficserver.apache.org>.
