This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 1f9d86c4a0 Increase minimum recommended Tomcat Native version to
2.0.12 for all
1f9d86c4a0 is described below
commit 1f9d86c4a040a188f37aaec865ad5526db2eb6c2
Author: Mark Thomas <[email protected]>
AuthorDate: Wed Feb 11 14:16:04 2026 +0000
Increase minimum recommended Tomcat Native version to 2.0.12 for all
---
java/org/apache/catalina/core/AprLifecycleListener.java | 13 +++----------
java/org/apache/catalina/core/LocalStrings.properties | 1 -
webapps/docs/changelog.xml | 4 ++++
3 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java
b/java/org/apache/catalina/core/AprLifecycleListener.java
index d10d9591fe..298e213a2c 100644
--- a/java/org/apache/catalina/core/AprLifecycleListener.java
+++ b/java/org/apache/catalina/core/AprLifecycleListener.java
@@ -66,8 +66,6 @@ public class AprLifecycleListener implements
LifecycleListener {
private static final int TCN_1_REQUIRED_MINOR = 3;
private static final int TCN_1_REQUIRED_PATCH = 4;
- private static final int TCN_1_RECOMMENDED_MINOR = 3;
- private static final int TCN_1_RECOMMENDED_PATCH = 4;
protected static final int TCN_REQUIRED_MAJOR = 2;
protected static final int TCN_REQUIRED_MINOR = 0;
@@ -265,7 +263,7 @@ public class AprLifecycleListener implements
LifecycleListener {
int rcver;
if (tcnMajor == 1) {
rqver = 1000 + TCN_1_REQUIRED_MINOR * 100 + TCN_1_REQUIRED_PATCH;
- rcver = 1000 + TCN_1_RECOMMENDED_MINOR * 100 +
TCN_1_RECOMMENDED_PATCH;
+ rcver = TCN_RECOMMENDED_MAJOR * 1000 + TCN_RECOMMENDED_MINOR * 100
+ TCN_RECOMMENDED_PV;
} else {
rqver = TCN_REQUIRED_MAJOR * 1000 + TCN_REQUIRED_MINOR * 100 +
TCN_REQUIRED_PATCH;
rcver = TCN_RECOMMENDED_MAJOR * 1000 + TCN_RECOMMENDED_MINOR * 100
+ TCN_RECOMMENDED_PV;
@@ -290,13 +288,8 @@ public class AprLifecycleListener implements
LifecycleListener {
return;
}
if (tcnVersion < rcver) {
- if (tcnMajor == 1) {
-
initInfoLogMessages.add(sm.getString("aprListener.tcnVersion.1",
Library.versionString(),
- "1." + TCN_1_RECOMMENDED_MINOR + "." +
TCN_1_RECOMMENDED_PATCH));
- } else {
- initInfoLogMessages.add(sm.getString("aprListener.tcnVersion",
Library.versionString(),
- TCN_RECOMMENDED_MAJOR + "." + TCN_RECOMMENDED_MINOR +
"." + TCN_RECOMMENDED_PV));
- }
+ initInfoLogMessages.add(sm.getString("aprListener.tcnVersion",
Library.versionString(),
+ TCN_RECOMMENDED_MAJOR + "." + TCN_RECOMMENDED_MINOR + "."
+ TCN_RECOMMENDED_PV));
}
initInfoLogMessages
diff --git a/java/org/apache/catalina/core/LocalStrings.properties
b/java/org/apache/catalina/core/LocalStrings.properties
index df0e718344..2f6d062084 100644
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -94,7 +94,6 @@ aprListener.tcnInvalid=An incompatible version [{0}] of the
Apache Tomcat Native
aprListener.tcnInvalid.1=An incompatible version [{0}] of the Apache Tomcat
Native library is installed, while Tomcat requires at least version [{1}] of
Tomcat Native 1.x
aprListener.tcnValid=Loaded Apache Tomcat Native library [{0}] using APR
version [{1}].
aprListener.tcnVersion=An older version [{0}] of the Apache Tomcat Native
library is installed, while Tomcat recommends a minimum version of [{1}]
-aprListener.tcnVersion.1=An older version [{0}] of the Apache Tomcat Native
library is installed, while Tomcat recommends a minimum version of [{1}] of
Tomcat Native 1.x
aprListener.tooLateForFIPSMode=Cannot setFIPSMode: SSL has already been
initialized
aprListener.tooLateForSSLEngine=Cannot setSSLEngine: SSL has already been
initialized
aprListener.tooLateForSSLRandomSeed=Cannot setSSLRandomSeed: SSL has already
been initialized
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 14ef4f18e8..f3dca83ebc 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -139,6 +139,10 @@
when closing am HTTP/2 connection. Pull request <pr>917</pr> provided
by
Kai Burjack. (markt)
</add>
+ <update>
+ Update the minimum recommended version of Tomcat Native so that users
of
+ 1.3.x are recommended to update to 2.0.x. (markt)
+ </update>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
