From: Eric Covener <covener@apache.org>
Date: Sun, 25 Mar 2012 23:44:56 +0000 (+0000)
Subject: remove backported entries
X-Git-Tag: 2.5.0-alpha~7305
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6ade43e50b1209bceaa376827cbffd566ab52a74;p=apache

remove backported entries


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1305179 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index dc68b08842..4314ffeb4f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,16 +1,6 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
-  *) core: Fix breakage of Listen directives with MPMs that use a
-     per-directory config. PR 52904. [Stefan Fritsch]
-
-  *) core: Disallow directives in AllowOverrideList which are only allowed
-     in VirtualHost or server context. These are usually not prepared to be
-     called in .htaccess files. [Stefan Fritsch]
-
-  *) core: In AllowOverrideList, do not allow 'None' together with other
-     directives. PR 52823. [Stefan Fritsch]
-
   *) mod_proxy: Correctly set up reverse proxy worker. PR 52935.
      [Petter Berntsen <petterb gmail.com>]