Author: markt
Date: Mon Feb 17 10:02:16 2014
New Revision: 1568929
URL: http://svn.apache.org/r1568929
Log:
Explicitly use the BIO connector in the SSL example in server.xml so it doesn't
break if APR is enabled.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/conf/server.xml
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1568926
Modified: tomcat/tc7.0.x/trunk/conf/server.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/conf/server.xml?rev=1568929&r1=1568928&r2=1568929&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/conf/server.xml (original)
+++ tomcat/tc7.0.x/trunk/conf/server.xml Mon Feb 17 10:02:16 2014
@@ -78,12 +78,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 BIO 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.Http11Protocol"
+ maxThreads="150" SSLEnabled="true" scheme="https" secure="true"
clientAuth="false" sslProtocol="TLS" />
-->
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1568929&r1=1568928&r2=1568929&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Feb 17 10:02:16 2014
@@ -103,6 +103,10 @@
Simplify Windows *.bat files: remove %OS% checks, as java 6 does
not run on ancient non-NT operating systems. (kkolinko)
</scode>
+ <fix>
+ <bug>56137</bug>: Explicitly use the BIO connector in the 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
