From: Jim Jagielski <jim@apache.org>
Date: Mon, 17 Dec 2012 11:50:03 +0000 (+0000)
Subject: backported
X-Git-Tag: 2.5.0-alpha~5980
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=854a0ebd03323bc9e50f7993fc606ba7a12732b5;p=apache

backported


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

diff --git a/CHANGES b/CHANGES
index 245b0ec2fc..d53402ace1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -35,14 +35,6 @@ Changes with Apache 2.5.0
   *) mod_allowhandlers: New module to forbid specific handlers for specific
      directories. [Stefan Fritsch]
 
-  *) core: Be more correct about rejecting directives that cannot work in <If>
-     sections. [Stefan Fritsch]
-
-  *) core: Fix directives like LogLevel that need to know if they are invoked
-     at virtual host context or in Directory/Files/Location/If sections to
-     work properly in If sections that are not in a Directory/Files/Location.
-     [Stefan Fritsch]
- 
   *) configure: Fix processing of --disable-FEATURE for various features.
      [Jeff Trawick]