[tomcat] 06/06: Skip setting attribute that is neither supported nor required for APR

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit ec2e21b4210b503c4050e6c1332d29b1dba50987
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jan 15 12:01:45 2020 +0000

    Skip setting attribute that is neither supported nor required for APR
---
 test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java 
b/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java
index bc52514..00c81a8 100644
--- a/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java
+++ b/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java
@@ -325,7 +325,10 @@ public class TestSSLHostConfigCompat extends 
TomcatBaseTest {
         connector.setScheme("https");
         connector.setSecure(true);
         Assert.assertTrue(connector.setProperty("SSLEnabled", "true"));
-        Assert.assertTrue(connector.setProperty("sslImplementationName", 
sslImplementationName));
+        if (!connector.getProtocolHandlerClassName().contains("Apr")) {
+            // Skip this for APR. It is not supported.
+            Assert.assertTrue(connector.setProperty("sslImplementationName", 
sslImplementationName));
+        }
         sslHostConfig.setProtocols("TLSv1.2");
         connector.addSslHostConfig(sslHostConfig);
 


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org