You are viewing a plain text version of this content. The canonical link for it is here.

Posted to cvs@httpd.apache.org by co...@apache.org on 2012/11/29 02:38:58 UTC

svn commit: r1415026 - /httpd/httpd/branches/2.4.x/STATUS

Author: covener
Date: Thu Nov 29 01:38:58 2012
New Revision: 1415026

URL: http://svn.apache.org/viewvc?rev=1415026&view=rev
Log:
propose Include /path/to/dir fix

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


Modified:
    httpd/httpd/branches/2.4.x/STATUS

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1415026&r1=1415025&r2=1415026&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Thu Nov 29 01:38:58 2012
@@ -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