From: Rainer Jung <rjung@apache.org>
Date: Sat, 4 Aug 2012 21:31:29 +0000 (+0000)
Subject: Remove backported items from trunk CHANGES.
X-Git-Tag: 2.5.0-alpha~6512
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ab34c4c3f9f3e7b6d4533695cefcaf505c9a835;p=thirdparty%2Fapache%2Fhttpd.git

Remove backported items from trunk CHANGES.


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

diff --git a/CHANGES b/CHANGES
index 090214779dc..c2dcf95148e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -17,10 +17,6 @@ Changes with Apache 2.5.0
   *) mod_lbmethod_heartbeat, mod_heartmonitor: Respect DefaultRuntimeDir/
      DEFAULT_REL_RUNTIMEDIR for the heartbeat storage file.  [Jeff Trawick]
 
-  *) mpm_event: Don't count connections in lingering close state when
-     calculating how many additional connections may be accepted.
-     [Stefan Fritsch]
-
   *) mod_ssl: Add RFC 5878 support. [Ben Laurie]
 
   *) mod_lua: Add new directive LuaAuthzProvider to allow implementing an
@@ -32,10 +28,6 @@ Changes with Apache 2.5.0
   *) mod_lua: Change prototype of vm_construct, to work around gcc bug which
      causes a segfault. PR 52779. [Dick Snippe <Dick Snippe tech omroep nl>]
 
-  *) mod_ssl: If exiting during initialization because of a fatal error,
-     log a message to the main error log pointing to the appropriate
-     virtual host error log. [Stefan Fritsch]
-
   *) 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]