Bug#444345: /etc/init.d/squid doesn't correctly honor SQUID_MAXFD setting

[Mark Ferlatte]

Package: squid
Version: 2.6.12-1
Tags: patch




I have attached a patch that removes this check.

M

--- init.d.squid.orig   2007-09-27 14:36:18.000000000 -0700
+++ init.d.squid        2007-09-27 14:36:29.000000000 -0700
@@ -66,7 +66,6 @@
maxfds () {
     [ -n "$SQUID_MAXFD" ] || return
     [ -f /proc/sys/fs/file-max ] || return 0
-    [ $SQUID_MAXFD -le 4096 ] || SQUID_MAXFD=4096
     global_file_max=`cat /proc/sys/fs/file-max`
     minimal_file_max=$(($SQUID_MAXFD + 4096))
     if [ "$global_file_max" -lt $minimal_file_max ]

In the function maxfds(), the init script appears to slam SQUID_MAXFD to 4096 regardless of how many file descriptors squid can actually use. I believe that the init script should not try to cap the SQUID_MAXFDS value anymore, since the squid binary does that internally based on a compile time value.

PGP.sig
Description: This is a digitally signed message part