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 9eca0c864505f02d794d00d46c53aa91524371b4 (commit) via 210673317524fce2073b908a8d920016614f5d72 (commit) via 9473df1ae828f3c110acc300209209214f025a98 (commit) via 7b9fe2c864b4451e5d6275166ddfa8d4c456fcaf (commit) from c8796dfba88eb17832cfc60f96c92e626d7cabf7 (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 9eca0c864505f02d794d00d46c53aa91524371b4 Merge: c8796df 2106733 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon May 23 21:52:13 2011 +0200

Merge branch 'master' into next

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

Summary of changes: config/httpd/server-tuning.conf | 4 ++-- config/rootfiles/core/49/filelists/files | 2 ++ html/cgi-bin/qos.cgi | 5 +++-- 3 files changed, 7 insertions(+), 4 deletions(-)

Difference in files: diff --git a/config/httpd/server-tuning.conf b/config/httpd/server-tuning.conf index 9cb7662..183ce80 100644 --- a/config/httpd/server-tuning.conf +++ b/config/httpd/server-tuning.conf @@ -18,8 +18,8 @@ MaxKeepAliveRequests 100 KeepAliveTimeout 15

MinSpareServers 1 -MaxSpareServers 2 -StartServers 2 +MaxSpareServers 10 +StartServers 1 MaxClients 10 MaxRequestsPerChild 100

diff --git a/config/rootfiles/core/49/filelists/files b/config/rootfiles/core/49/filelists/files index 565594a..3bc88dd 100644 --- a/config/rootfiles/core/49/filelists/files +++ b/config/rootfiles/core/49/filelists/files @@ -1,4 +1,5 @@ etc/system-release +etc/httpd/conf/server-tuning.conf etc/rc.d/init.d/squid etc/rc.d/init.d/waitdrives etc/rc.d/rcsysinit.d/S19waitdrives @@ -10,6 +11,7 @@ srv/web/ipfire/cgi-bin/logs.cgi/log.dat srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/cgi-bin/pppsetup.cgi srv/web/ipfire/cgi-bin/proxy.cgi +srv/web/ipfire/cgi-bin/qos.cgi srv/web/ipfire/cgi-bin/services.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi var/ipfire/langs/de.pl diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi index 60c75d7..844058d 100644 --- a/html/cgi-bin/qos.cgi +++ b/html/cgi-bin/qos.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -531,7 +531,7 @@ END open( FILE, "> $level7file" ) or die "Unable to write $level7file"; print FILE <<END 102;$qossettings{'RED_DEV'};dns;;; -102;$qossettings{'RED_DEV'};sip;;; +102;$qossettings{'RED_DEV'};rtp;;; 102;$qossettings{'RED_DEV'};skypetoskype;;; 103;$qossettings{'RED_DEV'};ssh;;; 103;$qossettings{'RED_DEV'};rdp;;; @@ -540,6 +540,7 @@ END 104;$qossettings{'RED_DEV'};pop3;;; 120;$qossettings{'RED_DEV'};applejuice;;; 120;$qossettings{'RED_DEV'};bittorrent;;; +200;imq0;rtp;;; 200;imq0;skypetoskype;;; 203;imq0;ssh;;; 203;imq0;rdp;;;

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