From: Rainer Jung <rjung@apache.org>
Date: Sun, 22 Jul 2012 11:26:35 +0000 (+0000)
Subject: Remove items from trunk CHANGES that have been ported back to 2.4.
X-Git-Tag: 2.5.0-alpha~6606
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ea82f356b0fce10f98a7a07f98336cd6375c31b;p=thirdparty%2Fapache%2Fhttpd.git

Remove items from trunk CHANGES that have been ported back to 2.4.


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

diff --git a/CHANGES b/CHANGES
index 661ecbc3ce8..b545160f1f7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -17,14 +17,9 @@ Changes with Apache 2.5.0
      calculating how many additional connections may be accepted.
      [Stefan Fritsch]
 
-  *) mod_deflate: Skip compression if compression is enabled at SSL level.
-     [Stefan Fritsch]
-
   *) mod_ext_filter: Fix error_log spam when input filters are configured.  
      [Joe Orton]
 
-  *) mod_rewrite: Add "AllowAnyURI" option. PR 52774. [Joe Orton]
-
   *) mod_ssl: Add RFC 5878 support. [Ben Laurie]
 
   *) mod_authz_core: If an expression in "Require expr" returns denied and
@@ -47,9 +42,6 @@ Changes with Apache 2.5.0
      log a message to the main error log pointing to the appropriate
      virtual host error log. [Stefan Fritsch]
 
-  *) mod_ldap: Treat the "server unavailable" condition as a transient
-     error with all LDAP SDKs.  [Filip Valder <filip.valder vsb.cz>]
-
   *) mod_ssl: Add support for TLS-SRP (Secure Remote Password key exchange
      for TLS, RFC 5054). PR 51075. [Quinn Slack <sqs cs stanford edu>,
      Christophe Renou, Peter Sylvester]
@@ -93,17 +85,6 @@ Changes with Apache 2.5.0
      Also set CC_FOR_BUILD to 'cc' when cross-compilation is detected.
      PR 51257. [Guenter Knauf]
 
-  *) mod_authz_core: Fix parsing of Require arguments in <AuthzProviderAlias>.
-     PR 53048. [Stefan Fritsch]
-
-  *) mod_proxy_fcgi: If there is an error reading the headers from the
-     backend, send an error to the client. PR 52879. [Stefan Fritsch]
-
-  *) mod_rewrite: Fix RewriteCond integer checks to be parsed correctly.
-     PR 53023. [Axel Reinhold <apache freakout.de>, André Malo]
-
-  *) Fix MPM DSO load failure on AIX.  [Jeff Trawick]
-
   *) core: Add the port number to the vhost's name in the scoreboard.
      [Stefan Fritsch]