propose Include /path/to/dir fix

back-to-back valid PR's submitted in the same minute.

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

diff --git a/STATUS b/STATUS
index 28a9a845014e27dc4712d9bcccb74d773e0c6fc4..7b49c82635dc518fe30421573d5fc167fd81374f 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -284,7 +284,18 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1412278
       2.4.x patch: http://people.apache.org/~jailletc36/backport_mod_dumpio.patch
       +1: jailletc36
-      
+     
+    * core: fail startup if ServerTokens arg is unrecognized, PR54222
+      trunk patch: http://svn.apache.org/viewvc?rev=1415008&view=rev
+      2.4.x patch: trunk works
+      +1: covener
+ 
+    * core: Accept "Include /some/dir" without wildcards as documented, 
+            regression from 2.2.x.  PR54223
+      trunk patch: http://svn.apache.org/viewvc?rev=1415023&view=rev
+      2.4.x patch: 2.4.x works
+      +1: covener      
+ 
 
 A list of further possible backports can be found at:
     http://people.apache.org/~rjung/patches/possible-backports-httpd-trunk-2_4.txt