Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x

[people/pmueller/ipfire-2.x.git] / config / rootfiles / common / apache2

diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2
index d7df625e9899d3bcfa9b867df53afa1d1350a602..c7262a5aedf60c099069ff93e15b268cc36c022a 100644 (file)
--- a/config/rootfiles/common/apache2
+++ b/config/rootfiles/common/apache2
@@ -740,6 +740,8 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/mod/mod_proxy_http.html.en
 #srv/web/ipfire/manual/mod/mod_proxy_scgi.html
 #srv/web/ipfire/manual/mod/mod_proxy_scgi.html.en
+#srv/web/ipfire/manual/mod/mod_reqtimeout.html
+#srv/web/ipfire/manual/mod/mod_reqtimeout.html.en
 #srv/web/ipfire/manual/mod/mod_rewrite.html
 #srv/web/ipfire/manual/mod/mod_rewrite.html.en
 #srv/web/ipfire/manual/mod/mod_setenvif.html
@@ -1242,6 +1244,7 @@ usr/lib/apache/mod_proxy_connect.so
 usr/lib/apache/mod_proxy_ftp.so
 usr/lib/apache/mod_proxy_http.so
 usr/lib/apache/mod_proxy_scgi.so
+usr/lib/apache/mod_reqtimeout.so
 usr/lib/apache/mod_rewrite.so
 usr/lib/apache/mod_setenvif.so
 usr/lib/apache/mod_speling.so
@@ -1259,12 +1262,12 @@ usr/lib/apache/mod_vhost_alias.so
 #usr/lib/libapr-1.la
 usr/lib/libapr-1.so
 usr/lib/libapr-1.so.0
-usr/lib/libapr-1.so.0.3.9
+usr/lib/libapr-1.so.0.4.2
 #usr/lib/libaprutil-1.a
 #usr/lib/libaprutil-1.la
 usr/lib/libaprutil-1.so
 usr/lib/libaprutil-1.so.0
-usr/lib/libaprutil-1.so.0.3.9
+usr/lib/libaprutil-1.so.0.3.10
 #usr/lib/pkgconfig/apr-1.pc
 #usr/lib/pkgconfig/apr-util-1.pc
 #usr/sbin/ab
@@ -1320,6 +1323,7 @@ srv/web/ipfire/cgi-bin/ddns.cgi
 srv/web/ipfire/cgi-bin/dhcp.cgi
 srv/web/ipfire/cgi-bin/dmzholes.cgi
 srv/web/ipfire/cgi-bin/extrahd.cgi
+srv/web/ipfire/cgi-bin/fireinfo.cgi
 srv/web/ipfire/cgi-bin/gui.cgi
 srv/web/ipfire/cgi-bin/hardwaregraphs.cgi
 srv/web/ipfire/cgi-bin/hosts.cgi
@@ -1336,6 +1340,7 @@ srv/web/ipfire/cgi-bin/netexternal.cgi
 srv/web/ipfire/cgi-bin/netinternal.cgi
 srv/web/ipfire/cgi-bin/netother.cgi
 srv/web/ipfire/cgi-bin/outgoingfw.cgi
+srv/web/ipfire/cgi-bin/outgoinggrp.cgi
 srv/web/ipfire/cgi-bin/optionsfw.cgi
 srv/web/ipfire/cgi-bin/ovpnmain.cgi
 srv/web/ipfire/cgi-bin/pakfire.cgi