Author: violetagg
Date: Tue Mar 22 09:45:53 2016
New Revision: 1736168
URL: http://svn.apache.org/viewvc?rev=1736168&view=rev
Log:
Revert r1736145
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=1736168&r1=1736167&r2=1736168&view=diff
==============================================================================
--- tomcat/trunk/conf/server.xml (original)
+++ tomcat/trunk/conf/server.xml Tue Mar 22 09:45:53 2016
@@ -98,7 +98,7 @@
<Connector port="8443"
protocol="org.apache.coyote.http11.Http11AprProtocol"
maxThreads="150" SSLEnabled="true" >
<UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
- <SSLHostConfig>
+ <SSLHostConfig honorCipherOrder="false" >
<Certificate certificateKeyFile="conf/localhost-rsa-key.pem"
certificateFile="conf/localhost-rsa-cert.pem"
certificateChainFile="conf/localhost-rsa-chain.pem"
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1736168&r1=1736167&r2=1736168&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Mar 22 09:45:53 2016
@@ -85,14 +85,6 @@
<subsection name="Other">
<changelog>
<fix>
- <bug>59209</bug>: Remove <code>honorCipherOrder=false</code> attribute
- from the connector example in server.xml. When the block is uncommented
- the connector will use the default value for this attribute which is
- <code>true</code>. If one needs to disable it, one can add it
- explicitly to the connector definition. Patch is provided by Huxing
- Zhang. (violetagg)
- </fix>
- <fix>
<bug>59211</bug>: Add hamcrest to Eclipse classpath. Patch is provided
by Huxing Zhang. (violetagg)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
