From: Joe Orton <jorton@apache.org>
Date: Fri, 23 Mar 2018 08:15:37 +0000 (+0000)
Subject: Propose.
X-Git-Tag: 2.4.34~279
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f4f29bd0b02a79bc1edabe0c0e9f05ee6bb31444;p=apache

Propose.

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

diff --git a/STATUS b/STATUS
index f4dc169f50..aa370de65a 100644
--- a/STATUS
+++ b/STATUS
@@ -194,6 +194,15 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c 1827196 ^/httpd/httpd/trunk .
      +1: icing
 
+  *) core: Add <IfFile>, <IfDirective>, <IfSection>
+     trunk patch: http://svn.apache.org/1769718
+                  http://svn.apache.org/1785943
+                  http://svn.apache.org/1786110
+                  http://svn.apache.org/1786119
+     2.4.x patch: http://people.apache.org/~jorton/ap_ifmany.diff
+          or resolve CHANGES & ap_mmn.h conflicts with:
+          svn merge -c 1769718,1785943,1786110,1786119 ^/httpd/httpd/trunk .
+     +1: jorton, 
 
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]