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
The following commit(s) were added to refs/heads/8.5.x by this push:
new e5fb671a1f Include major version in the Tomcat Native recommended
version
e5fb671a1f is described below
commit e5fb671a1f9c6e229d542bcd7bc02252eb20f4bb
Author: Mark Thomas <[email protected]>
AuthorDate: Tue May 31 19:06:53 2022 +0100
Include major version in the Tomcat Native recommended version
---
java/org/apache/catalina/core/AprLifecycleListener.java | 10 +++++-----
webapps/docs/changelog.xml | 4 ++++
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java
b/java/org/apache/catalina/core/AprLifecycleListener.java
index 862b51361a..4fdbc6c500 100644
--- a/java/org/apache/catalina/core/AprLifecycleListener.java
+++ b/java/org/apache/catalina/core/AprLifecycleListener.java
@@ -16,7 +16,6 @@
*/
package org.apache.catalina.core;
-
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
@@ -34,8 +33,6 @@ import org.apache.tomcat.jni.SSL;
import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.res.StringManager;
-
-
/**
* Implementation of <code>LifecycleListener</code> that will init and
* and destroy APR.
@@ -53,7 +50,9 @@ import org.apache.tomcat.util.res.StringManager;
public class AprLifecycleListener implements LifecycleListener {
private static final Log log =
LogFactory.getLog(AprLifecycleListener.class);
+
private static boolean instanceCreated = false;
+
/**
* Info messages during init() are cached until Lifecycle.BEFORE_INIT_EVENT
* so that, in normal (non-error) cases, init() related log messages appear
@@ -69,15 +68,16 @@ public class AprLifecycleListener implements
LifecycleListener {
// ---------------------------------------------- Constants
-
protected static final int TCN_REQUIRED_MAJOR = 1;
protected static final int TCN_REQUIRED_MINOR = 2;
protected static final int TCN_REQUIRED_PATCH = 14;
+ protected static final int TCN_RECOMMENDED_MAJOR = 1;
protected static final int TCN_RECOMMENDED_MINOR = 2;
protected static final int TCN_RECOMMENDED_PV = 30;
// ---------------------------------------------- Properties
+
protected static String SSLEngine = "on"; //default on
protected static String FIPSMode = "off"; // default off, valid only when
SSLEngine="on"
protected static String SSLRandomSeed = "builtin";
@@ -197,7 +197,7 @@ public class AprLifecycleListener implements
LifecycleListener {
int patch = 0;
int apver = 0;
int rqver = TCN_REQUIRED_MAJOR * 1000 + TCN_REQUIRED_MINOR * 100 +
TCN_REQUIRED_PATCH;
- int rcver = TCN_REQUIRED_MAJOR * 1000 + TCN_RECOMMENDED_MINOR * 100 +
TCN_RECOMMENDED_PV;
+ int rcver = TCN_RECOMMENDED_MAJOR * 1000 + TCN_RECOMMENDED_MINOR * 100
+ TCN_RECOMMENDED_PV;
if (aprInitialized) {
return;
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index af5c307e70..cab494ea09 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -125,6 +125,10 @@
<code>RemoteIPValve</code> persist after the request is put into
asynchronous mode. (markt)
</fix>
+ <add>
+ Include the major version in the recommended version used for Tomcat
+ Native with the <code>AprLifecycleListener</code>. (markt)
+ </add>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
