Author: remm
Date: Sat May 24 08:47:15 2014
New Revision: 1597264
URL: http://svn.apache.org/r1597264
Log:
If the SSL reneg test only fails on MacOs, it would be better to continue
running it on the other platforms.
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java
Modified: tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java?rev=1597264&r1=1597263&r2=1597264&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/TesterSupport.java Sat May 24
08:47:15 2014
@@ -127,13 +127,17 @@ public final class TesterSupport {
return ks;
}
+ protected static boolean isMacOs() {
+ return System.getProperty("os.name").toLowerCase().startsWith("mac os
x");
+ }
+
protected static boolean isRenegotiationSupported(Tomcat tomcat) {
String protocol = tomcat.getConnector().getProtocolHandlerClassName();
if (protocol.contains("Apr")) {
// Disabled by default in 1.1.20 windows binary (2010-07-27)
return false;
}
- if (protocol.contains("NioProtocol") ||
protocol.contains("Nio2Protocol")) {
+ if (protocol.contains("NioProtocol") ||
(protocol.contains("Nio2Protocol") && isMacOs())) {
// Doesn't work on all platforms - see BZ 56448.
return false;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
