From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue, 9 Mar 2010 19:35:42 +0000 (+0100)
Subject: Updated apache (2.2.15).
X-Git-Tag: v2.9-beta1~431
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=f36498f3281c77df67c38508a67042c947ffebd8;hp=5c1289aaba9339ccebae6abe9f3c17ce39a0fff6

Updated apache (2.2.15).
---

diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2
index 7be994920e..17dad12d13 100644
--- a/config/rootfiles/common/apache2
+++ b/config/rootfiles/common/apache2
@@ -741,6 +741,10 @@ etc/httpd/conf/mime.types
 #srv/web/ipfire/manual/mod/mod_proxy_ftp.html.en
 #srv/web/ipfire/manual/mod/mod_proxy_http.html
 #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
@@ -1231,6 +1235,8 @@ usr/lib/apache/mod_proxy_balancer.so
 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
@@ -1248,7 +1254,7 @@ 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.3
+usr/lib/libapr-1.so.0.4.2
 #usr/lib/libaprutil-1.a
 #usr/lib/libaprutil-1.la
 usr/lib/libaprutil-1.so
diff --git a/lfs/apache2 b/lfs/apache2
index 1223bf7d40..920bccdb4b 100644
--- a/lfs/apache2
+++ b/lfs/apache2
@@ -25,7 +25,7 @@
 
 include Config
 
-VER        = 2.2.11
+VER        = 2.2.15
 
 THISAPP    = httpd-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -47,7 +47,7 @@ objects = $(DL_FILE) \
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 httpd-2.2.2-config-1.patch = $(DL_FROM)/httpd-2.2.2-config-1.patch
 
-$(DL_FILE)_MD5 = 3e98bcb14a7122c274d62419566431bb
+$(DL_FILE)_MD5 = 016cec97337eccead2aad6a7c27f2e14
 httpd-2.2.2-config-1.patch_MD5 = e02a3ec5925eb9e111400b9aa229f822
 
 install : $(TARGET)