------------------------------------------------------------
revno: 13038
revision-id: squid3@treenet.co.nz-20131129042204-h05tb1twideppvbl
parent: squid3@treenet.co.nz-20131129041506-8gurtabkyirmbcr2
fixes bug(s): http://bugs.squid-cache.org/show_bug.cgi?id=3970
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.4
timestamp: Thu 2013-11-28 21:22:04 -0700
message:
  Bug 3970: max_filedescriptors disabled due to missing setrlimit
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20131129042204-h05tb1twideppvbl
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
# testament_sha1: ef6b4252d9ad0630514df1e07f1d7cb76a0c73c4
# timestamp: 2013-11-29 04:30:20 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
# base_revision_id: squid3@treenet.co.nz-20131129041506-\
#   8gurtabkyirmbcr2
# 
# Begin patch
=== modified file 'configure.ac'
--- configure.ac	2013-11-20 00:13:59 +0000
+++ configure.ac	2013-11-29 04:22:04 +0000
@@ -2575,7 +2575,6 @@
     ;;
 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 @@
   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 @@
   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 @@
 ])
 
 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])