Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1302670 - /httpd/httpd/branches/2.4.x/STATUS
Date: Mon, 19 Mar 2012 21:47:15 -0000
To: cvs@httpd.apache.org
From: sf@apache.org
Message-Id: <20120319214715.3AB0B2388CA1@eris.apache.org>

Author: sf
Date: Mon Mar 19 21:47:14 2012
New Revision: 1302670

URL: http://svn.apache.org/viewvc?rev=1302670&view=rev
Log:
propose

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=1302670&r1=1302669&r2=1302670&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Mon Mar 19 21:47:14 2012
@@ -113,6 +113,18 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     2.4.x patch: Trunk patch works (skip docs/log-message-tags/next-number)
     +1:  jim
 
+  * core: In AllowOverrideList, do not allow 'None' together with other directives.
+    PR 52823
+    Trunk patch: http://svn.apache.org/viewvc?rev=1302653&view=rev
+    2.4.x patch: Trunk patch works
+    +1: sf
+
+  * core: In AllowOverrideList, disallow directives which are only allowed
+    in VirtualHost or server context.
+    Trunk patch: http://svn.apache.org/viewvc?rev=1302665&view=rev
+    2.4.x patch: Trunk patch works (skip docs/log-message-tags/next-number)
+    +1: sf
+
 
 PATCHES/ISSUES THAT ARE STALLED