Author: rjung
Date: Wed Feb 13 23:42:26 2013
New Revision: 1445989
URL: http://svn.apache.org/r1445989
Log:
Minimum APR version is 1.3.0 since 1.1.25.
PR 54559
Submitted by ville dot skytta at iki dot fi.
Modified:
tomcat/native/branches/1.1.x/native/build/tcnative.m4
tomcat/native/branches/1.1.x/native/src/jnilib.c
tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml
Modified: tomcat/native/branches/1.1.x/native/build/tcnative.m4
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/build/tcnative.m4?rev=1445989&r1=1445988&r2=1445989&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/build/tcnative.m4 (original)
+++ tomcat/native/branches/1.1.x/native/build/tcnative.m4 Wed Feb 13 23:42:26
2013
@@ -33,10 +33,10 @@ AC_DEFUN(TCN_FIND_APR,[
sapr_version="`echo $sapr_pversion|sed -e 's/\([a-z]*\)$/.\1/'`"
tc_save_IFS=$IFS; IFS=.; set $sapr_version; IFS=$tc_save_IFS
if test "${1}" -lt "1"; then
- AC_MSG_ERROR(You need APR version 1.2.1 or newer installed.)
+ AC_MSG_ERROR(You need APR version 1.3.0 or newer installed.)
else
- if test "${2}" -lt "2"; then
- AC_MSG_ERROR(You need APR version 1.2.1 or newer installed.)
+ if test "${2}" -lt "3"; then
+ AC_MSG_ERROR(You need APR version 1.3.0 or newer installed.)
fi
fi
Modified: tomcat/native/branches/1.1.x/native/src/jnilib.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/jnilib.c?rev=1445989&r1=1445988&r2=1445989&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/src/jnilib.c (original)
+++ tomcat/native/branches/1.1.x/native/src/jnilib.c Wed Feb 13 23:42:26 2013
@@ -59,11 +59,11 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM
tcn_global_vm = vm;
/* Before doing anything else check if we have a valid
- * APR version. We need version 1.2.1 as minimum.
+ * APR version. We need version 1.3.0 as minimum.
*/
apr_version(&apv);
apvn = apv.major * 1000 + apv.minor * 100 + apv.patch;
- if (apvn < 1201) {
+ if (apvn < 1300) {
tcn_Throw(env, "Unupported APR version (%s)",
apr_version_string());
return JNI_ERR;
Modified: tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml?rev=1445989&r1=1445988&r2=1445989&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml Wed Feb 13
23:42:26 2013
@@ -62,6 +62,9 @@
</section>
<section name="Changes between 1.1.24 and 1.1.25 (not released)">
<changelog>
+ <update>
+ Minimum supported APR version is now 1.3.0. (mturk)
+ </update>
<fix>
<bug>52856</bug>: Fix high CPU usage when client changes IP address or
has high latency. (mturk)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
