From: Stefan Eissing <icing@apache.org>
Date: Thu, 17 Mar 2016 10:07:01 +0000 (+0000)
Subject: updates after backport
X-Git-Tag: 2.5.0-alpha~1881
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=09dd2d426d0f3ecd9c1d6ec0840854bc7fb8061f;p=apache

updates after backport

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

diff --git a/CHANGES b/CHANGES
index caceaf23e1..4ab656e6ff 100644
--- a/CHANGES
+++ b/CHANGES
@@ -61,11 +61,6 @@ Changes with Apache 2.5.0
      urls. Uses, so far, one connection per request, reuses connections.
      [Stefan Eissing]
   
-  *) event: use pre_connection hook to properly initialize connection state for
-     slave connections. use protocol_switch hook to initialize server config
-     early based on SNI selected vhost. 
-     [Stefan Eissing]
-  
   *) mod_filter: Fix AddOutputFilterByType with non-content-level filters.
      PR58856 [Micha Lenk <micha lenk.info>]
 
@@ -166,9 +161,6 @@ Changes with Apache 2.5.0
   *) mod_authnz_ldap: Resolve crashes with LDAP authz and non-LDAP authn since 
      r1608202. [Eric Covener]
 
-  *) core: Ensure that httpd exits with an error status when the MPM fails
-     to run.  [Yann Ylavic]
-
   *) apreq: Content-Length header should be always interpreted as a decimal.
      Leading 0 could be erroneously considered as an octal value. PR 56598.
      [Chris Card <ctcard hotmail com>]