propose

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

diff --git a/STATUS b/STATUS
index da4abc9a0dc7b7cc5d867972e1b674fbc62e997d..47e1a3881e780a2870f631d85089babd63adbeda 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -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