From: Stefan Eissing <icing@apache.org>
Date: Thu, 25 Feb 2016 10:42:32 +0000 (+0000)
Subject: update after backport
X-Git-Tag: 2.5.0-alpha~2014
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=947e44b106752339ad2a3168b03e762ea1cae30e;p=thirdparty%2Fapache%2Fhttpd.git

update after backport

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

diff --git a/CHANGES b/CHANGES
index bd0430105d9..24b8b5d87ec 100644
--- a/CHANGES
+++ b/CHANGES
@@ -66,11 +66,6 @@ Changes with Apache 2.5.0
      the correct negotiated server.
      [Stefan Eissing]
 
-  *) core: new hook "pre_close_connection" which is run before the lingering
-     close of connections is started. This gives protocol handlers one last
-     chance to use a connection before it goes down.
-     [Stefan Eissing]
-
   *) mod_filter: Fix AddOutputFilterByType with non-content-level filters.
      PR58856 [Micha Lenk <micha lenk.info>]
 
@@ -84,11 +79,6 @@ Changes with Apache 2.5.0
   *) ap_expr: expression support for variable HTTP2=on|off
      [Stefan Eissing]
 
-  *) mod_status/scoreboard: showing connection protocol in new column, new 
-     ap_update_child_status methods for updating server/description. mod_ssl
-     sets vhost negotiated by servername directly.
-     [Stefan Eissing]
-
   *) mod_http2: keep-alive blocking reads are done with 1 second timeouts to
      check for MPM stopping. Will announce early GOAWAY and finish processing
      open streams, then close.