This is an automated email from the ASF dual-hosted git repository. rjung pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push: new 17f779bf7b Add openssl ffm testing new 899e06a7ba Merge branch 'main' of https://github.com/apache/tomcat 17f779bf7b is described below commit 17f779bf7bb48e30e77146cee10a0d52194eaa7a Author: Rainer Jung <rainer.j...@kippdata.de> AuthorDate: Thu Apr 18 23:11:48 2024 +0200 Add openssl ffm testing --- .../catalina/valves/rewrite/TestResolverSSL.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/test/org/apache/catalina/valves/rewrite/TestResolverSSL.java b/test/org/apache/catalina/valves/rewrite/TestResolverSSL.java index 2bebd2cbf5..978ab23c25 100644 --- a/test/org/apache/catalina/valves/rewrite/TestResolverSSL.java +++ b/test/org/apache/catalina/valves/rewrite/TestResolverSSL.java @@ -35,6 +35,7 @@ import org.apache.catalina.Container; import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; import org.apache.catalina.core.AprLifecycleListener; +import org.apache.catalina.core.OpenSSLLifecycleListener; import org.apache.catalina.core.StandardServer; import org.apache.catalina.startup.Tomcat; import org.apache.catalina.startup.TomcatBaseTest; @@ -42,6 +43,7 @@ import org.apache.catalina.valves.ValveBase; import org.apache.tomcat.util.buf.ByteChunk; import org.apache.tomcat.util.net.SSLHostConfig; import org.apache.tomcat.util.net.TesterSupport; +import org.apache.tomcat.util.net.openssl.OpenSSLImplementation; @RunWith(Parameterized.class) public class TestResolverSSL extends TomcatBaseTest { @@ -52,6 +54,8 @@ public class TestResolverSSL extends TomcatBaseTest { parameterSets.add(new Object[] { "JSSE", Boolean.FALSE, "org.apache.tomcat.util.net.jsse.JSSEImplementation" }); parameterSets.add( new Object[] { "OpenSSL", Boolean.TRUE, "org.apache.tomcat.util.net.openssl.OpenSSLImplementation" }); + parameterSets.add( + new Object[] { "OpenSSL", Boolean.TRUE, "org.apache.tomcat.util.net.openssl.panama.OpenSSLImplementation" }); return parameterSets; } @@ -173,10 +177,17 @@ public class TestResolverSSL extends TomcatBaseTest { Assert.assertTrue(tomcat.getConnector().setProperty("sslImplementationName", sslImplementationName)); if (useOpenSSL) { - AprLifecycleListener listener = new AprLifecycleListener(); - Assume.assumeTrue(AprLifecycleListener.isAprAvailable()); - StandardServer server = (StandardServer) tomcat.getServer(); - server.addLifecycleListener(listener); + if (OpenSSLImplementation.class.getName().equals(sslImplementationName)) { + AprLifecycleListener listener = new AprLifecycleListener(); + Assume.assumeTrue(AprLifecycleListener.isAprAvailable()); + StandardServer server = (StandardServer) tomcat.getServer(); + server.addLifecycleListener(listener); + } else if ("org.apache.tomcat.util.net.openssl.panama.OpenSSLImplementation".equals(sslImplementationName)) { + OpenSSLLifecycleListener listener = new OpenSSLLifecycleListener(); + Assume.assumeTrue(OpenSSLLifecycleListener.isAvailable()); + StandardServer server = (StandardServer) tomcat.getServer(); + server.addLifecycleListener(listener); + } } } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org