Author: markt
Date: Fri Mar 18 13:17:57 2016
New Revision: 1735598
URL: http://svn.apache.org/viewvc?rev=1735598&view=rev
Log:
Update with 8.5 info
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/webapps/docs/config/http.xml
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 18 13:17:57 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597
Modified: tomcat/tc8.5.x/trunk/webapps/docs/config/http.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/config/http.xml?rev=1735598&r1=1735597&r2=1735598&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/config/http.xml Fri Mar 18 13:17:57 2016
@@ -923,16 +923,16 @@
<section name="Nested Components">
- <p>Starting with Tomcat 9, Tomcat supports Server Name Indication (SNI). This
- allows multiple SSL configurations to be associated with a single secure
- connector with the configuration used for any given connection determined by
- the host name requested by the client. To facilitate this, Tomcat 9 added the
- <strong>SSLHostConfig</strong> element which can be used to define one of
- these configurations. Any number of <strong>SSLHostConfig</strong> may be
- nested in a <strong>Connector</strong>. Tomcat 9 also adds support for
- multiple certificates to be associated with a single
- <strong>SSLHostConfig</strong>. Each SSL certificate is therefore configured
- in a <strong>Certificate</strong> element with in an
+ <p>First implemented in Tomcat 9 and back-ported to 8.5, Tomcat now supports
+ Server Name Indication (SNI). This allows multiple SSL configurations to be
+ associated with a single secure connector with the configuration used for any
+ given connection determined by the host name requested by the client. To
+ facilitate this, the <strong>SSLHostConfig</strong> element was added which
+ can be used to define one of these configurations. Any number of
+ <strong>SSLHostConfig</strong> may be nested in a <strong>Connector</strong>.
+ At the same time, support was added for multiple certificates to be
associated
+ with a single <strong>SSLHostConfig</strong>. Each SSL certificate is
+ therefore configured in a <strong>Certificate</strong> element with in an
<strong>SSLHostConfig</strong>. For further information, see the SSL Support
section below.</p>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
