summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpquerna <pquerna@13f79535-47bb-0310-9956-ffa450edef68>2005-03-15 22:57:42 +0000
committerpquerna <pquerna@13f79535-47bb-0310-9956-ffa450edef68>2005-03-15 22:57:42 +0000
commit14e56d3d8e7f8deaaa806e5242deccdb45e8925e (patch)
treed04f9f9b82bfbbcd0606e5ca1a050b05ce491e68
parent322b2ea378a6f3b75993614ecff5509a3c974ad2 (diff)
downloadlibapr-14e56d3d8e7f8deaaa806e5242deccdb45e8925e.tar.gz
backport r151340 from trunk, disable sendfile on s/390 only for Linux <2.4.0 kernels.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.1.x@157604 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--CHANGES3
-rw-r--r--configure.in5
2 files changed, 7 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 7d9d57ca7..80c943dcc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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]
diff --git a/configure.in b/configure.in
index 48d22b71f..5fe4b2dfb 100644
--- a/configure.in
+++ b/configure.in
@@ -910,7 +910,10 @@ AC_ARG_WITH(sendfile, [ --with-sendfile Override decision to use sendfi
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