From: Stefan Fritsch Date: Sun, 25 Mar 2012 20:13:46 +0000 (+0000) Subject: promote X-Git-Tag: 2.4.2~99 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1421500dd072e09cfa847e0f09f22594563aa22f;p=apache promote git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1305114 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index d6c8fe1dcb..58947dfcbd 100644 --- a/STATUS +++ b/STATUS @@ -88,6 +88,18 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] + * 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, covener, druggeri + + * 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, covener, druggeri + PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] @@ -111,18 +123,6 @@ 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, covener, druggeri - - * 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, covener, druggeri - * proxy: Correctly save the reverse proxy worker in all virtual host proxy configs. Trunk Patch: http://svn.apache.org/viewvc?rev=1302444&view=rev http://svn.apache.org/viewvc?rev=1302483&view=rev