You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2016/11/23 12:36:55 UTC
svn commit: r1770954 - in /tomcat/trunk: conf/server.xml
webapps/docs/changelog.xml
Author: markt
Date: Wed Nov 23 12:36:55 2016
New Revision: 1770954
URL: http://svn.apache.org/viewvc?rev=1770954&view=rev
Log:
Update comments for TLS connector examples
Modified:
tomcat/trunk/conf/server.xml
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/conf/server.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/conf/server.xml?rev=1770954&r1=1770953&r2=1770954&view=diff
==============================================================================
--- tomcat/trunk/conf/server.xml (original)
+++ tomcat/trunk/conf/server.xml Wed Nov 23 12:36:55 2016
@@ -77,8 +77,12 @@
redirectPort="8443" />
-->
<!-- Define a SSL/TLS HTTP/1.1 Connector on port 8443
- This connector uses the NIO implementation with the JSSE engine. When
- using the JSSE engine, the JSSE configuration attributes must be used.
+ This connector uses the NIO implementation. The default
+ SSLImplementation will depend on the presence of the APR/native
+ library and the useOpenSSL attribute of the
+ AprLifecycleListener.
+ Either JSSE or OpenSSL style configuration may be used regardless of
+ the SSLImplementation selected. JSSE style configuration is used below.
-->
<!--
<Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
@@ -90,9 +94,10 @@
</Connector>
-->
<!-- Define a SSL/TLS HTTP/1.1 Connector on port 8443 with HTTP/2
- This connector uses the APR/native implementation. When using the
- APR/native implementation or the OpenSSL engine with NIO or NIO2 then
- the OpenSSL configuration attributes must be used.
+ This connector uses the APR/native implementation which always uses
+ OpenSSL for TLS.
+ Either JSSE or OpenSSL style configuration may be used. OpenSSL style
+ configuration is used below.
-->
<!--
<Connector port="8443" protocol="org.apache.coyote.http11.Http11AprProtocol"
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1770954&r1=1770953&r2=1770954&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Nov 23 12:36:55 2016
@@ -162,6 +162,10 @@
<code>org.apache.tomcat:tomcat-catalina</code> maven artifact.
(violetagg)
</fix>
+ <fix>
+ Update the comments associated with the TLS Connector examples in
+ <code>server.xml</code>. (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org