This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new b2ef351457 Fix regression in HTTP/2 test refactoring
b2ef351457 is described below
commit b2ef35145777415c4e13c6f55263476dbd8f6c5f
Author: Mark Thomas <[email protected]>
AuthorDate: Fri Jun 24 09:30:36 2022 +0100
Fix regression in HTTP/2 test refactoring
---
test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java | 5 +----
test/org/apache/tomcat/util/net/TesterSupport.java | 6 +++++-
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java
b/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java
index e098b54d2d..bc824a0456 100644
--- a/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java
+++ b/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java
@@ -323,10 +323,7 @@ public class TestSSLHostConfigCompat extends
TomcatBaseTest {
connector.setScheme("https");
connector.setSecure(true);
Assert.assertTrue(connector.setProperty("SSLEnabled", "true"));
- if (!connector.getProtocolHandlerClassName().contains("Apr")) {
- // Skip this for APR. It is not supported.
- Assert.assertTrue(connector.setProperty("sslImplementationName",
sslImplementationName));
- }
+ TesterSupport.configureSSLImplementation(tomcat,
sslImplementationName);
sslHostConfig.setProtocols("TLSv1.2");
connector.addSslHostConfig(sslHostConfig);
diff --git a/test/org/apache/tomcat/util/net/TesterSupport.java
b/test/org/apache/tomcat/util/net/TesterSupport.java
index f903c70666..570e6b1ce6 100644
--- a/test/org/apache/tomcat/util/net/TesterSupport.java
+++ b/test/org/apache/tomcat/util/net/TesterSupport.java
@@ -261,7 +261,11 @@ public final class TesterSupport {
} catch (Exception e) {
Assume.assumeNoException(e);
}
-
Assert.assertTrue(tomcat.getConnector().setProperty("sslImplementationName",
sslImplementationName));
+ Connector connector = tomcat.getConnector();
+ if (!connector.getProtocolHandlerClassName().contains("Apr")) {
+ // Skip this for APR. It is not supported.
+ Assert.assertTrue(connector.setProperty("sslImplementationName",
sslImplementationName));
+ }
}
public static void configureClientCertContext(Tomcat tomcat) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
