From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 27 Jul 2010 20:28:38 +0000 (+0000)
Subject: Fix unit test failure with APR. SSL renegotiation will not work by default for this... 
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=1b262a857093e2eaf65901eae0c2952c8e939ec9;p=tomcat7.0

Fix unit test failure with APR. SSL renegotiation will not work by default for this connector.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@979854 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/test/org/apache/catalina/startup/TestTomcatSSL.java b/test/org/apache/catalina/startup/TestTomcatSSL.java
index 5b1d8164c..b268e8b80 100644
--- a/test/org/apache/catalina/startup/TestTomcatSSL.java
+++ b/test/org/apache/catalina/startup/TestTomcatSSL.java
@@ -188,6 +188,9 @@ public class TestTomcatSSL extends TomcatBaseTest {
         if (protocol.indexOf("Nio") != -1) {
             return; // Not supported yet (2010-07-22)
         }
+        if (protocol.indexOf("Apr") != -1) {
+            return; // Disabled by default in 1.1.20 windows binary (2010-07-27)
+        }
 
         SSLContext sslCtx = SSLContext.getInstance("TLS");
         sslCtx.init(null, trustAllCerts, new java.security.SecureRandom());