[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4f160f04cb819cafd9b4ddc53ccb24d48668aa92

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4f160f04cb819cafd9b4ddc53ccb24d48668aa92

[git]

[-- Attachment #1: Type: text/plain, Size: 2193 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  4f160f04cb819cafd9b4ddc53ccb24d48668aa92 (commit)
      from  1e6ce289bd8520b07897fa0f70253c8e56acc188 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4f160f04cb819cafd9b4ddc53ccb24d48668aa92
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Nov 21 21:36:02 2013 +0100

    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.

-----------------------------------------------------------------------

Summary of changes:
 html/cgi-bin/proxy.cgi | 2 +-
 lfs/squid              | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index 6dd900f..acb4f97 100644
--- 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+/) ||
-		($proxysettings{'FILEDESCRIPTORS'} < 1) || ($proxysettings{'FILEDESCRIPTORS'} > 65536))
+		($proxysettings{'FILEDESCRIPTORS'} < 1) || ($proxysettings{'FILEDESCRIPTORS'} > 1048576))
 	{
 		$errormessage = $Lang::tr{'proxy errmsg filedescriptors'};
 		goto ERROR;
diff --git a/lfs/squid b/lfs/squid
index a341857..1c17c0c 100644
--- a/lfs/squid
+++ b/lfs/squid
@@ -104,8 +104,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		--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 \


hooks/post-receive
--
IPFire 2.x development tree