Author: markt
Date: Mon Feb 17 09:59:57 2014
New Revision: 1568926
URL: http://svn.apache.org/r1568926
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56137
Explicitly use NIO connector in SSL example in server.xml so it doesn't break
if APR is enabled.
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=1568926&r1=1568925&r2=1568926&view=diff
==============================================================================
--- tomcat/trunk/conf/server.xml (original)
+++ tomcat/trunk/conf/server.xml Mon Feb 17 09:59:57 2014
@@ -76,12 +76,13 @@
redirectPort="8443" />
-->
<!-- Define a SSL HTTP/1.1 Connector on port 8443
- This connector uses the JSSE configuration, when using APR, the
- connector should be using the OpenSSL style configuration
- described in the APR documentation -->
+ This connector uses the NIO implementation that requires the JSSE
+ style configuration. When using the APR/native implementation, the
+ OpenSSL style configuration is required as described in the APR/native
+ documentation -->
<!--
- <Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true"
- maxThreads="150" scheme="https" secure="true"
+ <Connector port="8443"
protocol="org.apache.coyote.http11.Http11NioProtocol"
+ maxThreads="150" SSLEnabled="true" scheme="https" secure="true"
clientAuth="false" sslProtocol="TLS" />
-->
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1568926&r1=1568925&r2=1568926&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Feb 17 09:59:57 2014
@@ -116,6 +116,10 @@
Explicitly specify --LogPath path when uninstalling Windows service,
avoiding default value for that option. (kkolinko)
</fix>
+ <fix>
+ <bug>56137</bug>: Explicitly use NIO connector in SSL example in
+ server.xml so it doesn't break if APR is enabled. (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
