You are viewing a plain text version of this content. The canonical link for it is here.

Posted to cvs@httpd.apache.org by jo...@apache.org on 2018/03/23 08:15:37 UTC

svn commit: r1827549 - /httpd/httpd/branches/2.4.x/STATUS

Author: jorton
Date: Fri Mar 23 08:15:37 2018
New Revision: 1827549

URL: http://svn.apache.org/viewvc?rev=1827549&view=rev
Log:
Propose.

Modified:
    httpd/httpd/branches/2.4.x/STATUS

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1827549&r1=1827548&r2=1827549&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Fri Mar 23 08:15:37 2018
@@ -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 ]