Commit c530f7f1 authored by Joe Orton's avatar Joe Orton
Browse files

Propose. 

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

STATUS

+9 −0
Original line number Diff line number Diff line
@@ -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 ]