[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 920cc7233335608630a117183b24ee0d5ff2a908

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 920cc7233335608630a117183b24ee0d5ff2a908

[git]

[-- Attachment #1: Type: text/plain, Size: 1938 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  920cc7233335608630a117183b24ee0d5ff2a908 (commit)
       via  a610e13655dcf9fcb50a2b1e16bd39ffe37f30ad (commit)
      from  c50ba483d2e9e6c5b403847152e76afe1470453b (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 920cc7233335608630a117183b24ee0d5ff2a908
Merge: a610e13 c50ba48
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Jul 15 22:05:12 2013 +0200

    Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

commit a610e13655dcf9fcb50a2b1e16bd39ffe37f30ad
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Jul 15 22:04:59 2013 +0200

    squid: Allow to set more FDs in CGI.

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

Summary of changes:
 html/cgi-bin/proxy.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Difference in files:
diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index c42d35a..76d52b4 100644
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -381,7 +381,7 @@ if (($proxysettings{'ACTION'} eq $Lang::tr{'save'}) || ($proxysettings{'ACTION'}
 		}
 	}
 	if (!($proxysettings{'FILEDESCRIPTORS'} =~ /^\d+/) ||
-		($proxysettings{'FILEDESCRIPTORS'} < 1) || ($proxysettings{'FILEDESCRIPTORS'} > 16384))
+		($proxysettings{'FILEDESCRIPTORS'} < 1) || ($proxysettings{'FILEDESCRIPTORS'} > 65536))
 	{
 		$errormessage = $Lang::tr{'proxy errmsg filedescriptors'};
 		goto ERROR;


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