This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 1.3.x
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
The following commit(s) were added to refs/heads/1.3.x by this push:
new ef40b6d00 Update minimum APR version in a few more places
ef40b6d00 is described below
commit ef40b6d00c4bdaa23960b5dc0eaac28cce758d29
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Feb 6 16:40:25 2024 +0000
Update minimum APR version in a few more places
---
native/build/tcnative.m4 | 4 ++--
native/src/jnilib.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/native/build/tcnative.m4 b/native/build/tcnative.m4
index eee9710dc..5e663e36e 100644
--- a/native/build/tcnative.m4
+++ b/native/build/tcnative.m4
@@ -38,9 +38,9 @@ AC_DEFUN(TCN_FIND_APR,[
set $sapr_version
IFS=$tc_save_IFS
decimal_apr_version=`printf %02d%02d%03d ${1} ${2} ${3}`
- if test "${decimal_apr_version}" -lt "0104003"
+ if test "${decimal_apr_version}" -lt "0106003"
then
- AC_MSG_ERROR(Found APR $sapr_version. You need version 1.4.3 or newer
installed.)
+ AC_MSG_ERROR(Found APR $sapr_version. You need version 1.6.3 or newer
installed.)
fi
AC_MSG_NOTICE(APR $sapr_version detected.)
diff --git a/native/src/jnilib.c b/native/src/jnilib.c
index 6f20dd94f..f46774ac2 100644
--- a/native/src/jnilib.c
+++ b/native/src/jnilib.c
@@ -75,7 +75,7 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved)
apr_version(&apv);
apvn = apv.major * 1000 + apv.minor * 100 + apv.patch;
if (apvn < 1603) {
- tcn_Throw(env, "Unsupported APR version %s: this tcnative requires at
least 1.4.3",
+ tcn_Throw(env, "Unsupported APR version %s: this tcnative requires at
least 1.6.3",
apr_version_string());
return JNI_ERR;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
