Author: rjung
Date: Fri Feb 15 04:18:04 2013
New Revision: 1446443
URL: http://svn.apache.org/r1446443
Log:
Restore compatibility with APR 1.2.x.
For optimal performance 1.3.x or higher
is needed.
Submitted by: mturk
Modified:
tomcat/native/branches/1.1.x/native/build/tcnative.m4
tomcat/native/branches/1.1.x/native/include/tcn.h
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=1446443&r1=1446442&r2=1446443&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/build/tcnative.m4 (original)
+++ tomcat/native/branches/1.1.x/native/build/tcnative.m4 Fri Feb 15 04:18:04
2013
@@ -33,10 +33,12 @@ 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.3.0 or newer installed.)
+ AC_MSG_ERROR(You need APR version 1.2.0 or newer installed. For optimal
performance version 1.3.0 or newer is needed.)
else
- if test "${2}" -lt "3"; then
- AC_MSG_ERROR(You need APR version 1.3.0 or newer installed.)
+ if test "${2}" -lt "2"; then
+ AC_MSG_ERROR(You need APR version 1.2.0 or newer installed. For optimal
performance version 1.3.0 or newer is needed.)
+ elif test "${2}" -lt "3"; then
+ AC_MSG_WARN(For optimal performance you need APR version 1.3.0 or newer
installed.)
fi
fi
Modified: tomcat/native/branches/1.1.x/native/include/tcn.h
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/include/tcn.h?rev=1446443&r1=1446442&r2=1446443&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/include/tcn.h (original)
+++ tomcat/native/branches/1.1.x/native/include/tcn.h Fri Feb 15 04:18:04 2013
@@ -51,6 +51,21 @@
#include <unistd.h>
#endif
+#if !defined(APR_POLLSET_NOCOPY)
+/* Add missing API */
+#define APR_RING_FOREACH(ep, head, elem, link) \
+ for (ep = APR_RING_FIRST(head); \
+ ep != APR_RING_SENTINEL(head, elem, link); \
+ ep = APR_RING_NEXT(ep, link))
+
+#define APR_RING_FOREACH_SAFE(ep1, ep2, head, elem, link) \
+ for (ep1 = APR_RING_FIRST(head), ep2 = APR_RING_NEXT(ep1, link); \
+ ep1 != APR_RING_SENTINEL(head, elem, link); \
+ ep1 = ep2, ep2 = APR_RING_NEXT(ep1, link))
+
+#define APR_POLLSET_NOCOPY 0
+#endif
+
#include "tcn_api.h"
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=1446443&r1=1446442&r2=1446443&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/src/jnilib.c (original)
+++ tomcat/native/branches/1.1.x/native/src/jnilib.c Fri Feb 15 04:18:04 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.3.0 as minimum.
+ * APR version.
*/
apr_version(&apv);
apvn = apv.major * 1000 + apv.minor * 100 + apv.patch;
- if (apvn < 1300) {
+ if (apvn < 1200) {
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=1446443&r1=1446442&r2=1446443&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml Fri Feb 15
04:18:04 2013
@@ -38,6 +38,14 @@
</section>
<section name="Changes between 1.1.26 and 1.1.27">
<changelog>
+ <update>
+ Minimum supported APR version is now again 1.2.0. Version 1.3.0
+ of APR improves performance. (rjung)
+ </update>
+ </changelog>
+</section>
+<section name="Changes between 1.1.26 and 1.1.27">
+ <changelog>
<fix>
<bug>54513</bug>: Fix regression in pollset return value. (mturk)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
