]> granicus.if.org Git - apache/commitdiff
propose
authorStefan Fritsch <sf@apache.org>
Sat, 24 Mar 2012 16:35:06 +0000 (16:35 +0000)
committerStefan Fritsch <sf@apache.org>
Sat, 24 Mar 2012 16:35:06 +0000 (16:35 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1304853 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 5e390000b12360dd7dd69ebc0722c4d2262fb304..7cdf3efa7b792cb39c08da4805d22002ec184919 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -134,6 +134,11 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     2.4.x patch:  http://people.apache.org/~covener/patches/httpd-2.4.x-proxy_reverse.diff
     +1: 
 
+  * core: Fix merging of AllowOverrideList and ContentDigest.
+    Trunk patch: http://svn.apache.org/viewvc?rev=1304852&view=rev
+    2.4.x patch: Trunk patch works
+    +1: sf
+
 PATCHES/ISSUES THAT ARE STALLED