From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4f160f04cb819cafd9b4ddc53ccb24d48668aa92
Date: Thu, 21 Nov 2013 21:41:11 +0100 [thread overview]
Message-ID: <20131121204111.C889E21542@argus.ipfire.org> (raw)
[-- 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
reply other threads:[~2013-11-21 20:41 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20131121204111.C889E21542@argus.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox