Propose r1814968 for backport

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

diff --git a/STATUS b/STATUS
index b3d8423cf6c4c8dd04228899a36eb9abfe57a992..f8e2f29b7a4e2ba3591533ecde7dd546a8979a64 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -234,6 +234,11 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   svn merge -c 1809273,1814719 ^/httpd/httpd/trunk .
      +1: ylavic
 
+  *) core: silently ignore a not existent file path when IncludeOptional is used.
+     trunk patch: http://svn.apache.org/r1814968
+     2.4.x patch: trunk works (modulo CHANGES)
+                  svn merge -c r1814968 ^/httpd/httpd/trunk .
+     +1: elukey
 
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]