Author: remy.maucherat(a)jboss.com Date: 2014-12-08 04:56:56 -0500 (Mon, 08 Dec 2014) New Revision: 2569 Modified: branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java Log: Comment out the protocol filtering code (JDK 6 incompatibility that has been ruled as more important). Modified: branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java =================================================================== --- branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java 2014-12-05 10:06:08 UTC (rev 2568) +++ branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java 2014-12-08 09:56:56 UTC (rev 2569) @@ -736,10 +736,12 @@ } public static String[] filterInsecureProcotols(String[] protocols) { + // Filtering is disabled for Java 6 compatibility (TLS is nearly unusable with it) + return protocols; + /* if (protocols == null) { return null; } - List<String> result = new ArrayList<String>(protocols.length); for (String protocol : protocols) { if (protocol == null || protocol.toUpperCase(Locale.ENGLISH).contains("SSL")) { @@ -751,5 +753,6 @@ } } return result.toArray(new String[result.size()]); + */ } }