Commit 12b82494 authored by Joe Orton's avatar Joe Orton
Browse files

Merged, with compat note added in core.xml. 

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

STATUS

+0 −11
Original line number Diff line number Diff line
@@ -144,17 +144,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



  *) core: Add <IfFile>, <IfDirective>, <IfSection>

     trunk patch: http://svn.apache.org/r1769718

                  http://svn.apache.org/r1785943

                  http://svn.apache.org/r1786110

                  http://svn.apache.org/r1786119

     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, ylavic, covener

     jailletc36: There should be a compatibility note for the new directives.

                 (done in r1828478)



PATCHES PROPOSED TO BACKPORT FROM TRUNK:

  [ New proposals should be added at the end of the list ]