This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new c98c4f766a Minor optimisation and ignore all Tomcat internal OCSP
settings on store
c98c4f766a is described below
commit c98c4f766a9b2948a0d1938794ce8bcd7a4dba92
Author: Mark Thomas <[email protected]>
AuthorDate: Wed May 27 11:43:11 2026 +0100
Minor optimisation and ignore all Tomcat internal OCSP settings on store
---
java/org/apache/catalina/storeconfig/OpenSSLConfSF.java | 3 ++-
java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java | 2 ++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/storeconfig/OpenSSLConfSF.java
b/java/org/apache/catalina/storeconfig/OpenSSLConfSF.java
index 7f0b2f50ee..f52969bdec 100644
--- a/java/org/apache/catalina/storeconfig/OpenSSLConfSF.java
+++ b/java/org/apache/catalina/storeconfig/OpenSSLConfSF.java
@@ -33,7 +33,8 @@ public class OpenSSLConfSF extends StoreFactoryBase {
public OpenSSLConfSF() {
}
- private static final Set<String> INTERNAL_COMMANDS =
Set.of(OpenSSLConfCmd.NO_OCSP_CHECK);
+ private static final Set<String> INTERNAL_COMMANDS =
Set.of(OpenSSLConfCmd.NO_OCSP_CHECK,
+ OpenSSLConfCmd.OCSP_SOFT_FAIL, OpenSSLConfCmd.OCSP_TIMEOUT,
OpenSSLConfCmd.OCSP_VERIFY_FLAGS);
/**
* Store nested OpenSSLConfCmd elements.
diff --git a/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
b/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
index a5ee58fcc6..ad2f93f721 100644
--- a/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
+++ b/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
@@ -411,6 +411,7 @@ public class OpenSSLContext implements
org.apache.tomcat.util.net.SSLContext {
for (OpenSSLConfCmd command :
sslHostConfig.getOpenSslConf().getCommands()) {
if
(OpenSSLConfCmd.NO_OCSP_CHECK.equals(command.getName())) {
foundOcspConfig = true;
+ break;
}
}
if (!foundOcspConfig) {
@@ -430,6 +431,7 @@ public class OpenSSLContext implements
org.apache.tomcat.util.net.SSLContext {
for (OpenSSLConfCmd command :
sslHostConfig.getOpenSslConf().getCommands()) {
if (OpenSSLConfCmd.GROUPS.equals(command.getName())) {
foundGroupsConfig = true;
+ break;
}
}
if (!foundGroupsConfig) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
