From: Ruediger Pluem <rpluem@apache.org>
Date: Mon, 2 Oct 2006 21:19:48 +0000 (+0000)
Subject: * Two backport proposals
X-Git-Tag: 2.2.4~142
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea2e108649e6a5661e610b2e6a16da091b581103;p=thirdparty%2Fapache%2Fhttpd.git

* Two backport proposals


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@452218 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index 4169bc0c8c2..10545f087b8 100644
--- a/STATUS
+++ b/STATUS
@@ -246,3 +246,19 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       Trunk: http://svn.apache.org/viewvc?view=rev&revision=450089
       +1: minfrin
 
+    * mod_mime_magic: Fix precedence problem.
+        PR: 40656
+      Trunk version of patch:
+        http://svn.apache.org/viewvc?view=rev&rev=452212
+      2.2.x version of patch:
+        Trunk version works
+      +1: rpluem
+
+    * mod_echo: Fix precedence problem.
+        PR: 40658
+      Trunk version of patch:
+        http://svn.apache.org/viewvc?view=rev&rev=452213
+      2.2.x version of patch:
+        Trunk version works
+      +1: rpluem
+