Backported.

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

diff --git a/CHANGES b/CHANGES
index c6759cb329cb9bf955ec29fda61f4a8879e1e23d..0dd159dc1cda89ed592c254cfcc20893291a1d6c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -46,13 +46,6 @@ Changes with Apache 2.5.0
      work properly in If sections that are not in a Directory/Files/Location.
      [Stefan Fritsch]
  
-  *) mod_proxy_ftp: Fix segfaults on IPv4 requests to hosts with DNS AAAA records.
-     PR 40841. [Andrew Rucker Jones <arjones simultan dyndns org>,
-     <ast domdv de>, Jim Jagielski]
-
-  *) ap_expr: Add req_novary function that allows HTTP header lookups
-     without adding the name to the Vary header. [Stefan Fritsch]
-
   *) configure: Fix processing of --disable-FEATURE for various features.
      [Jeff Trawick]
 
@@ -73,9 +66,6 @@ Changes with Apache 2.5.0
      balancer-manager) between graceful and normal restarts.
      [Jim Jagielski]
 
-  *) mod_slotmem: New provider function, fgrab(), which forces an
-     allocation of a slot. [Jim Jagielski]
-
   *) mod_lua: Add LuaInputFilter/LuaOutputFilter for creating content
      filters in Lua [Daniel Gruno]