Author: markt Date: Fri Mar 18 13:22:22 2016 New Revision: 1735601 URL: http://svn.apache.org/viewvc?rev=1735601&view=rev Log: More 8.5 updates
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:22:22 2016 @@ -1 +1 @@ -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597 +/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600 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=1735601&r1=1735600&r2=1735601&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:22:22 2016 @@ -990,13 +990,14 @@ respectively, to pass correct information to the servlets.</p> <p>The NIO and NIO2 connectors use either the JSSE Java SSL implementation or - an OpenSSL implementation, whereas the - APR/native connector uses OpenSSL only. Prior to Tomcat 9, different configuration - attributes were used for JSSE and OpenSSL. From Tomcat 9 onwards, and as far - as possible, common configuration attributes are used for both JSSE and - OpenSSL. Also if using the JSSE OpenSSL implementation, configuration can be set using - either the JSSE or APR attributes (note: but not both types within the same configuration). - This is to aid simpler switching between connector implementations for SSL connectors.</p> + an OpenSSL implementation, whereas the APR/native connector uses OpenSSL only. + Prior to Tomcat 8.5, different configuration attributes were used for JSSE and + OpenSSL. From Tomcat 8.5 onwards, and as far as possible, common configuration + attributes are used for both JSSE and OpenSSL. Also if using the JSSE OpenSSL + implementation, configuration can be set using either the JSSE or APR + attributes (note: but not both types within the same configuration). This is + to aid simpler switching between connector implementations for SSL + connectors.</p> <p>Each secure connector must define at least one <strong>SSLHostConfig</strong>. The names of the @@ -1008,7 +1009,7 @@ <strong>Certificate</strong>. The types of the <strong>Certificate</strong>s must be unique.</p> - <p>As of Tomcat 9, the majority of the SSL configuration attributes in the + <p>As of Tomcat 8.5, the majority of the SSL configuration attributes in the <strong>Connector</strong> are deprecated. If specified, they will be used to configure a <strong>SSLHostConfig</strong> and <strong>Certificate</strong> for the <code>sslDefaultHost</code>. Note that if an explicit --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org