Author: violetagg Date: Thu Mar 26 14:09:05 2015 New Revision: 1669346 URL: http://svn.apache.org/r1669346 Log: Correct the check used for Java 8 JSSE server-preferred TLS cipher suite ordering. Patch provided by Ognjen Blagojevic.
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1669346&r1=1669345&r2=1669346&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Thu Mar 26 14:09:05 2015 @@ -654,7 +654,7 @@ public abstract class AbstractEndpoint<S private void testServerCipherSuitesOrderSupport() { // Only test this feature if the user explicitly requested its use. if(!"".equals(getUseServerCipherSuitesOrder().trim())) { - if (JreCompat.isJre8Available()) { + if (!JreCompat.isJre8Available()) { throw new UnsupportedOperationException( sm.getString("endpoint.jsse.cannotHonorServerCipherOrder")); } 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=1669346&r1=1669345&r2=1669346&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Mar 26 14:09:05 2015 @@ -56,6 +56,14 @@ issues do not "pop up" wrt. others). --> <section name="Tomcat 7.0.61 (violetagg)"> + <subsection name="Catalina"> + <changelog> + <fix> + Correct the check used for Java 8 JSSE server-preferred TLS cipher + suite ordering. Patch provided by Ognjen Blagojevic. (violetagg) + </fix> + </changelog> + </subsection> </section> <section name="Tomcat 7.0.60 (violetagg)"> <subsection name="Catalina"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org