Merge branch 'master' into next

diff --git a/config/httpd/server-tuning.conf b/config/httpd/server-tuning.conf
index 9cb766232787f8d6ad1581b6d53c31a64d0f4cc9..183ce80fa046eea79331630323544e61a56e9d9c 100644 (file)
--- 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 565594a5e0b69177d3100e8856bf48ff62b23283..3bc88ddde0cc270bcdfb19f1639935b0a6a5e0f6 100644 (file)
--- 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 60c75d73654f4cf9aacc0d1bee3ea40fea1b298e..844058de3276cf249dde5669ce9603576b326f14 100644 (file)
--- 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;;;