From: Rainer Jung <rjung@apache.org>
Date: Sun, 22 Jul 2012 12:06:21 +0000 (+0000)
Subject: Remove backported items from trunk CHANGES.
X-Git-Tag: 2.5.0-alpha~6605
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c745fd9252cedb54769a806c7ba0b238fd729d47;p=apache

Remove backported items from trunk CHANGES.


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

diff --git a/CHANGES b/CHANGES
index b545160f1f..03463adfc3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,9 +10,6 @@ Changes with Apache 2.5.0
   *) mpm_prefork: Reduce spawn rate after a child process exits due to
      unexpected poll or accept failure.  [Jeff Trawick]
 
-  *) core: Log value of Status header line in script responses rather
-     than the fixed header name.  [Chris Darroch]
-
   *) mpm_event: Don't count connections in lingering close state when
      calculating how many additional connections may be accepted.
      [Stefan Fritsch]
@@ -22,10 +19,6 @@ Changes with Apache 2.5.0
 
   *) mod_ssl: Add RFC 5878 support. [Ben Laurie]
 
-  *) mod_authz_core: If an expression in "Require expr" returns denied and
-     references %{REMOTE_USER}, trigger authentication and retry. PR 52892.
-     [Stefan Fritsch]
-
   *) mod_lua: Add new directive LuaAuthzProvider to allow implementing an
      authorization provider in lua. [Stefan Fritsch]
 
@@ -56,8 +49,6 @@ Changes with Apache 2.5.0
   *) apxs: Use LDFLAGS from config_vars.mk in addition to CFLAGS and CPPFLAGS.
      [Stefan Fritsch]
 
-  *) mpm_event: Fix handling of MaxConnectionsPerChild. [Stefan Fritsch]
-
   *) suexec: Add --enable-suexec-capabilites support on Linux, to use
      setuid/setgid capability bits rather than a setuid root binary.
      [Joe Orton]