[tomcat-native] 02/02: Minimum APR version is now 1.7.0

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git

commit 25196d38d5bff5c5db8ae6d09e112dc5d3f26277
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed May 25 16:13:54 2022 +0100

    Minimum APR version is now 1.7.0
---
 native/src/jnilib.c               | 6 +++---
 xdocs/miscellaneous/changelog.xml | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/native/src/jnilib.c b/native/src/jnilib.c
index 32f5151dd..97284fb1c 100644
--- a/native/src/jnilib.c
+++ b/native/src/jnilib.c
@@ -70,12 +70,12 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved)
     tcn_global_vm = vm;
     env           = (JNIEnv *)ppe;
     /* Before doing anything else check if we have a valid
-     * APR version. We need version 1.4.3 as minimum.
+     * APR version. We need version 1.7.0 as minimum.
      */
     apr_version(&apv);
     apvn = apv.major * 1000 + apv.minor * 100 + apv.patch;
-    if (apvn < 1403) {
-        tcn_Throw(env, "Unsupported APR version %s: this tcnative requires at least 1.4.3",
+    if (apvn < 1700) {
+        tcn_Throw(env, "Unsupported APR version %s: this tcnative requires at least 1.7.0",
                   apr_version_string());
         return JNI_ERR;
     }
diff --git a/xdocs/miscellaneous/changelog.xml b/xdocs/miscellaneous/changelog.xml
index b75237453..3dc6e0461 100644
--- a/xdocs/miscellaneous/changelog.xml
+++ b/xdocs/miscellaneous/changelog.xml
@@ -41,6 +41,9 @@
       Update the minimum required version of OpenSSL to 3.0.0 and make it a
       madatory dependency. (markt)
     </update>
+    <update>
+      Update the minimum required version of APR to 1.7.0. (markt)
+    </update>
   </changelog>
 </section>
 <section name="Changes in 1.2.x">


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org