From: Amos Jeffries <squid3@treenet.co.nz>
Date: Thu, 15 May 2008 11:43:06 +0000 (+1200)
Subject: Author: Joshua Root <josh+squid@root.id.au>
X-Git-Tag: SQUID_3_1_0_1~49^2~241
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f168f0c5f456118d6cb5fc7fa50d6ce6a4a2f478;p=thirdparty%2Fsquid.git

Author: Joshua Root <josh+squid@root.id.au>
Bug 2204: configure fails to detect max open files

The behaviour of setrusage has changed in Mac OS X 10.5.
---

diff --git a/configure.in b/configure.in
index 09c28b1c7e..c44185d5d7 100644
--- a/configure.in
+++ b/configure.in
@@ -3212,7 +3212,12 @@ main() {
     if (getrlimit(RLIMIT_NOFILE, &rl) < 0) {
         perror("getrlimit: RLIMIT_NOFILE");
     } else {
+#if defined(__APPLE__)
+        /* asking for more than OPEN_MAX fails on Leopard */
+        rl.rlim_cur = (OPEN_MAX < rl.rlim_max ? OPEN_MAX : rl.rlim_max);
+#else
         rl.rlim_cur = rl.rlim_max;      /* set it to the max */
+#endif
         if (setrlimit(RLIMIT_NOFILE, &rl) < 0) {
             perror("setrlimit: RLIMIT_NOFILE");
         }