src/patches/squid-3.3.10-set-rlimit-fds.patch

   1 http://bazaar.launchpad.net/~squid/squid/3-trunk/revision/13144
   2
   3     Committer: Amos Jeffries
   4     Date: 2013-11-23 01:28:52 UTC
   5     Revision ID: squid3@treenet.co.nz-20131123012852-zpe8hamjrs5vy42w
   6
   7 http://bugs.squid-cache.org/show_bug.cgi?id=3970
   8 Bug 3970: max_filedescriptors disabled due to missing setrlimit
   9
  10 === modified file 'configure.ac'
  11 --- configure.ac        2013-11-16 13:19:28 +0000
  12 +++ configure.ac        2013-11-23 01:28:52 +0000
  13 @@ -2534,7 +2534,6 @@
  14      ;;
  15  esac
  16
  17 -
  18  dnl --with-maxfd present for compatibility with Squid-2.
  19  dnl undocumented in ./configure --help  to encourage using the Squid-3 directive
  20  AC_ARG_WITH(maxfd,,
  21 @@ -2542,6 +2541,7 @@
  22    case ${withval} in
  23      [[0-9]]*)
  24        squid_filedescriptors_num=$withval
  25 +      AC_MSG_NOTICE([forcing default of $squid_filedescriptors_num filedescriptors (user-forced)])
  26        ;;
  27      *)
  28        AC_MSG_ERROR(--with-maxfd expects a numeric argument)
  29 @@ -2556,6 +2556,7 @@
  30    case ${withval} in
  31      [[0-9]]*)
  32        squid_filedescriptors_num=$withval
  33 +      AC_MSG_NOTICE([forcing default of $squid_filedescriptors_num filedescriptors (user-forced)])
  34        ;;
  35      *)
  36        AC_MSG_ERROR(--with-filedescriptors expects a numeric argument)
  37 @@ -2564,10 +2565,9 @@
  38  ])
  39
  40  SQUID_CHECK_DEFAULT_FD_SETSIZE
  41 -if test "x$squid_filedescriptors_num" = "x"; then
  42 -  SQUID_CHECK_MAXFD
  43 -else
  44 -  AC_MSG_NOTICE([forcing use of $squid_filedescriptors_num filedescriptors (user-forced)])
  45 +SQUID_CHECK_MAXFD
  46 +if test "x$squid_filedescriptors_num" != "x"; then
  47 +  AC_MSG_NOTICE([Default number of fieldescriptors: $squid_filedescriptors_num])
  48  fi
  49  if test "$squid_filedescriptors_num" -lt 512 ; then
  50      AC_MSG_WARN([$squid_filedescriptors_num may not be enough filedescriptors if your])
  51