Author: violetagg
Date: Tue Mar 22 07:56:56 2016
New Revision: 1736147
URL: http://svn.apache.org/viewvc?rev=1736147&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=59209
Merged revision 1736145 from tomcat/trunk:
Remove honorCipherOrder="false" from the server.xml.
When the block is uncommented the implementation will use the default which is
honorCipherOrder="false"
Patch provided by Huxing Zhang
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/conf/server.xml
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
tomcat/tc8.5.x/trunk/webapps/docs/config/http.xml
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 22 07:56:56 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145
Modified: tomcat/tc8.5.x/trunk/conf/server.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/conf/server.xml?rev=1736147&r1=1736146&r2=1736147&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/conf/server.xml (original)
+++ tomcat/tc8.5.x/trunk/conf/server.xml Tue Mar 22 07:56:56 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 honorCipherOrder="false" >
+ <SSLHostConfig>
<Certificate certificateKeyFile="conf/localhost-rsa-key.pem"
certificateFile="conf/localhost-rsa-cert.pem"
certificateChainFile="conf/localhost-rsa-chain.pem"
Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1736147&r1=1736146&r2=1736147&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Tue Mar 22 07:56:56 2016
@@ -65,6 +65,18 @@
</add>
</changelog>
</subsection>
+ <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>false</code>. If one needs to enable it, one can add it
+ explicitly to the connector definition. Use of this feature requires
+ Java 8 or later. Patch is provided by Huxing Zhang. (violetagg)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 8.5.0" rtext="Release in progress">
<subsection name="Other">
Modified: tomcat/tc8.5.x/trunk/webapps/docs/config/http.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/config/http.xml?rev=1736147&r1=1736146&r2=1736147&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/config/http.xml Tue Mar 22 07:56:56 2016
@@ -1111,7 +1111,8 @@
<attribute name="honorCipherOrder" required="false">
<p>Set to <code>true</code> to enforce the server's cipher order
(from the <code>ciphers</code> setting) instead of allowing
- the client to choose the cipher. The default is <code>true</code>.</p>
+ the client to choose the cipher. The default is <code>false</code>.
+ Use of this feature requires Java 8 or later.</p>
</attribute>
<attribute name="hostName" required="false">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
