From: Eric Covener <covener@apache.org>
Date: Thu, 29 Nov 2012 01:38:58 +0000 (+0000)
Subject: propose Include /path/to/dir fix
X-Git-Tag: 2.4.4~408
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e8eb2dd356e9550ca924e2a3a885a4e1148c1a48;p=apache

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 28a9a84501..7b49c82635 100644
--- 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