Skip to content

Commit

Permalink
Update comments for TLS connector examples
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1770954 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
markt-asf committed Nov 23, 2016
1 parent 7b0f17a commit 6633e23
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 5 deletions.
15 changes: 10 additions & 5 deletions conf/server.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
4 changes: 4 additions & 0 deletions webapps/docs/changelog.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 6633e23

Please sign in to comment.