Author: pquerna
Date: Tue Mar 15 14:57:42 2005
New Revision: 157604
URL: http://svn.apache.org/viewcvs?view=rev&rev=157604
Log:
backport r151340 from trunk, disable sendfile on s/390 only for Linux <2.4.0
kernels.
Modified:
apr/apr/branches/1.1.x/CHANGES
apr/apr/branches/1.1.x/configure.in
Modified: apr/apr/branches/1.1.x/CHANGES
URL:
http://svn.apache.org/viewcvs/apr/apr/branches/1.1.x/CHANGES?view=diff&r1=157603&r2=157604
==============================================================================
--- apr/apr/branches/1.1.x/CHANGES (original)
+++ apr/apr/branches/1.1.x/CHANGES Tue Mar 15 14:57:42 2005
@@ -1,5 +1,8 @@
Changes for APR 1.1.1
+ *) Disable sendfile support for S/390 only in kernel versions < 2.4.0.
+ [Joe Orton]
+
*) Fix posix rwlock detection on Darwin. [Aaron Bannert]
*) Build fix for Multicast support on HP-UX 11.00 and Tru64 [Joe Orton]
Modified: apr/apr/branches/1.1.x/configure.in
URL:
http://svn.apache.org/viewcvs/apr/apr/branches/1.1.x/configure.in?view=diff&r1=157603&r2=157604
==============================================================================
--- apr/apr/branches/1.1.x/configure.in (original)
+++ apr/apr/branches/1.1.x/configure.in Tue Mar 15 14:57:42 2005
@@ -910,7 +910,10 @@
sendfile="0"
;;
s390-*-linux-gnu)
- sendfile="0"
+ # disable sendfile support for 2.2 on S/390
+ if test $os_version -lt 240; then
+ sendfile="0"
+ fi
;;
*aix*)
# compiler-independent check for 64-bit build
