Author: markt Date: Thu May 7 13:33:28 2015 New Revision: 1678196 URL: http://svn.apache.org/r1678196 Log: Back-pedal slightly. The odd SSL config attribute will still be required on the connector.
Modified: tomcat/trunk/webapps/docs/config/http.xml Modified: tomcat/trunk/webapps/docs/config/http.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=1678196&r1=1678195&r2=1678196&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/config/http.xml (original) +++ tomcat/trunk/webapps/docs/config/http.xml Thu May 7 13:33:28 2015 @@ -1011,7 +1011,7 @@ match the <code>sslDefaultHost</code> attribute of the <strong>Connector</strong>.</p> - <p>As of Tomcat 9, the SSL configuration attributes in the + <p>As of Tomcat 9, 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> for the <code>sslDefaultHost</code>. Note that if an explicit @@ -1323,9 +1323,29 @@ </subsection> + <subsection name="SSL Support - Connector - NIO and NIO2"> + + <p>The following NIO and NIO2 SSL configuration attributes are not specific to + a virtual host and, therefore, must be configured on the connector.</p> + + <attributes> + + <attribute name="sslImplementationName" required="false"> + <p>The class name of the SSL implementation to use. If not specified, the + default of <code>org.apache.tomcat.util.net.jsse.JSSEImplementation</code> + will be used which wraps JVM's default JSSE provider. Note that the + JVM can be configured to use a different JSSE provider as the default.</p> + </attribute> + + </attributes> + + </subsection> + <subsection name="SSL Support - Connector - NIO and NIO2 (deprecated)"> - <p>The NIO and NIO2 connectors use the following attributes to configure SSL: + <p>The following NIO and NIO2 SSL configuration attributes have been + depreacted in favour of the default + <a href="#SSL_Support_-_SSLHostConfig">SSLHostConfig</a> element. </p> <attributes> @@ -1407,13 +1427,6 @@ element.</p> </attribute> - <attribute name="sslImplementationName" required="false"> - <p>The class name of the SSL implementation to use. If not specified, the - default of <code>org.apache.tomcat.util.net.jsse.JSSEImplementation</code> - will be used which wraps JVM's default JSSE provider. Note that the - JVM can be configured to use a different JSSE provider as the default.</p> - </attribute> - <attribute name="sslProtocol" required="false"> <p>This is an alias for the <code>sslProtocol</code> attribute of the default <a href="#SSL_Support_-_SSLHostConfig">SSLHostConfig</a> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org