proxy: Set number of file descriptors much higher.

Some users are hitting the 65k limit regularly, so
we set the limit to a much higher number.

diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index 6dd900ffda0faaab1aa0bdae295a29de497b3429..acb4f979a76709b30bb4707188e3b9c5d4cee3dd 100644 (file)
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -391,7 +391,7 @@ if (($proxysettings{'ACTION'} eq $Lang::tr{'save'}) || ($proxysettings{'ACTION'}
                }
        }
        if (!($proxysettings{'FILEDESCRIPTORS'} =~ /^\d+/) ||
                }
        }
        if (!($proxysettings{'FILEDESCRIPTORS'} =~ /^\d+/) ||

-               ($proxysettings{'FILEDESCRIPTORS'} < 1) || ($proxysettings{'FILEDESCRIPTORS'} > 65536))
+               ($proxysettings{'FILEDESCRIPTORS'} < 1) || ($proxysettings{'FILEDESCRIPTORS'} > 1048576))

        {
                $errormessage = $Lang::tr{'proxy errmsg filedescriptors'};
                goto ERROR;
        {
                $errormessage = $Lang::tr{'proxy errmsg filedescriptors'};
                goto ERROR;

diff --git a/lfs/squid b/lfs/squid
index a341857f76c0130d978d7c50e094f39e06bd486b..1c17c0c3b81c400c1a92821334877bdb88da0d34 100644 (file)
--- a/lfs/squid
+++ b/lfs/squid
@@ -104,8 +104,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                --enable-eui \
                --with-pthreads \
                --with-dl \
                --enable-eui \
                --with-pthreads \
                --with-dl \

-               --with-maxfd="65536" \
-               --with-filedescriptors=65536 \
+               --with-filedescriptors=$$(( 16384 * 64 )) \

                --with-large-files \
                --with-aio \
                --enable-async-io=8 \
                --with-large-files \
                --with-aio \
                --enable-async-io=8 \