This is an automated email from the ASF dual-hosted git repository.
remm 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 7868cb1e62 Add comment
7868cb1e62 is described below
commit 7868cb1e62fd6c6b043e539c7c3a10b0c9cc27eb
Author: remm <[email protected]>
AuthorDate: Thu Feb 15 15:28:06 2024 +0100
Add comment
---
java/org/apache/catalina/connector/Connector.java | 3 +++
1 file changed, 3 insertions(+)
diff --git a/java/org/apache/catalina/connector/Connector.java
b/java/org/apache/catalina/connector/Connector.java
index f2d68763cb..240a83d614 100644
--- a/java/org/apache/catalina/connector/Connector.java
+++ b/java/org/apache/catalina/connector/Connector.java
@@ -1010,6 +1010,7 @@ public class Connector extends LifecycleMBeanBase {
if (JreCompat.isJre22Available() && OpenSSLStatus.getUseOpenSSL() &&
OpenSSLStatus.isAvailable()
&& protocolHandler instanceof AbstractHttp11Protocol) {
+ // Use FFM and OpenSSL if available
AbstractHttp11Protocol<?> jsseProtocolHandler =
(AbstractHttp11Protocol<?>) protocolHandler;
if (jsseProtocolHandler.isSSLEnabled() &&
jsseProtocolHandler.getSslImplementationName() == null) {
// OpenSSL is compatible with the JSSE configuration, so use
it if it is available
@@ -1018,12 +1019,14 @@ public class Connector extends LifecycleMBeanBase {
}
} else if (AprStatus.isAprAvailable() && AprStatus.getUseOpenSSL() &&
protocolHandler instanceof AbstractHttp11Protocol) {
+ // Use tomcat-native and OpenSSL otherwise, if available
AbstractHttp11Protocol<?> jsseProtocolHandler =
(AbstractHttp11Protocol<?>) protocolHandler;
if (jsseProtocolHandler.isSSLEnabled() &&
jsseProtocolHandler.getSslImplementationName() == null) {
// OpenSSL is compatible with the JSSE configuration, so use
it if APR is available
jsseProtocolHandler.setSslImplementationName(OpenSSLImplementation.class.getName());
}
}
+ // Otherwise the default JSSE will be used
try {
protocolHandler.init();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
