From: Eric Covener <covener@apache.org>
Date: Tue, 24 Mar 2015 13:11:51 +0000 (+0000)
Subject: backported
X-Git-Tag: 2.5.0-alpha~3359
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=38e4ec9b510f514f38015251a5dd085180c4dc5d;p=apache

backported



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

diff --git a/CHANGES b/CHANGES
index ef7ad4f847..0a640b6275 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,11 +1,6 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
-  *) SECURITY: CVE-2015-0253 (cve.mitre.org)
-     core: Fix a crash introduced in with ErrorDocument 400 pointing
-     to a local URL-path with the INCLUDES filter active, introduced
-     in 2.4.11. PR 57531. [Yann Ylavic]
-
   *) core: Initialize scoreboard's used optional functions on graceful restarts
      to avoid a crash when relocation occurs.  PR 57177.  [Yann Ylavic]
 
@@ -129,10 +124,6 @@ Changes with Apache 2.5.0
      headers are passed to scripts as CGI variables.  PR 56855.  [Jeff 
      Trawick]
 
-  *) mod_rewrite: Improve relative substitutions in per-directory/htaccess
-     context for directories found by mod_userdir and mod_alias.  These no
-     longer require RewriteBase to be specified. [Eric Covener]
-
   *) mod_authnz_ldap: Resolve crashes with LDAP authz and non-LDAP authn since 
      r1608202. [Eric Covener]