From: Ruediger Pluem <rpluem@apache.org>
Date: Fri, 26 Apr 2013 11:39:00 +0000 (+0000)
Subject: * Backported
X-Git-Tag: 2.5.0-alpha~5536
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0ae4b08e2cb8eda20459b8554fa2fcaccf355be1;p=apache

* Backported

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

diff --git a/CHANGES b/CHANGES
index deca4432f0..c22aa325ab 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,6 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
-  *) mod_setenvif: Fix crash in case SetEnvif and SetEnvIfExpr are used
-     together. PR 54881. [Ruediger Pluem]
-
   *) mod_dav: Make sure that when we prepare an If URL for Etag comparison,
      we compare unencoded paths. PR 53910 [Timothy Wood <tjw omnigroup.com>]
 
@@ -12,9 +9,6 @@ Changes with Apache 2.5.0
      to reverse the sense of a poll event from a read to a write or vice
      versa. [Graham Leggett]
 
-  *) core: Add workaround for gcc bug on sparc/64bit. PR 52900.
-     [Stefan Fritsch]
-
   *) htpasswd: Add -v option to verify a password. [Stefan Fritsch]
 
   *) htpasswd, htdbm: Fix password generation. PR 54735. [Stefan Fritsch]