From 29d29875b19d2f1ca1fc1d9d534a4f47c5888a22 Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Thu, 28 Nov 2013 21:22:04 -0700 Subject: [PATCH] Bug 3970: max_filedescriptors disabled due to missing setrlimit --- configure.ac | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 8944a3b1bd..c972015e4e 100644 --- a/configure.ac +++ b/configure.ac @@ -2575,7 +2575,6 @@ case "$squid_host_os" in ;; esac - dnl --with-maxfd present for compatibility with Squid-2. dnl undocumented in ./configure --help to encourage using the Squid-3 directive AC_ARG_WITH(maxfd,, @@ -2583,6 +2582,7 @@ AC_ARG_WITH(maxfd,, case ${withval} in [[0-9]]*) squid_filedescriptors_num=$withval + AC_MSG_NOTICE([forcing default of $squid_filedescriptors_num filedescriptors (user-forced)]) ;; *) AC_MSG_ERROR(--with-maxfd expects a numeric argument) @@ -2597,6 +2597,7 @@ AC_ARG_WITH(filedescriptors, case ${withval} in [[0-9]]*) squid_filedescriptors_num=$withval + AC_MSG_NOTICE([forcing default of $squid_filedescriptors_num filedescriptors (user-forced)]) ;; *) AC_MSG_ERROR(--with-filedescriptors expects a numeric argument) @@ -2605,10 +2606,9 @@ AC_ARG_WITH(filedescriptors, ]) SQUID_CHECK_DEFAULT_FD_SETSIZE -if test "x$squid_filedescriptors_num" = "x"; then - SQUID_CHECK_MAXFD -else - AC_MSG_NOTICE([forcing use of $squid_filedescriptors_num filedescriptors (user-forced)]) +SQUID_CHECK_MAXFD +if test "x$squid_filedescriptors_num" != "x"; then + AC_MSG_NOTICE([Default number of fieldescriptors: $squid_filedescriptors_num]) fi if test "$squid_filedescriptors_num" -lt 512 ; then AC_MSG_WARN([$squid_filedescriptors_num may not be enough filedescriptors if your]) -- 2.47.2