From: Jim Jagielski <jim@apache.org>
Date: Tue, 14 Aug 2012 21:12:24 +0000 (+0000)
Subject: In 2.4.x
X-Git-Tag: 2.5.0-alpha~6432
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d5eb8c1dafa1d3b9113f07b8fdb5ff0893b3e33;p=thirdparty%2Fapache%2Fhttpd.git

In 2.4.x


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

diff --git a/CHANGES b/CHANGES
index ed71e0e42f3..4ea0ffed172 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,11 +6,6 @@ Changes with Apache 2.5.0
      or we risk losing data with an appended charset. PR 53698
      [Petter Berntsen <petterb gmail.com>]
 
-  *) Windows: Fix SSL failures on windows with AcceptFilter https none.
-     PR: 52476.  [Jeff Trawick]
-
-  *) ab: Fix read failure when targeting SSL server.  [Jeff Trawick]
-
   *) mod_lua: Decline handling 'lua-script' if the file doesn't exist,
      rather than throwing an internal server error. [Daniel Gruno]
 
@@ -30,16 +25,6 @@ Changes with Apache 2.5.0
   *) mod_lua: Add new directive LuaCodeCache for controlling in-memory
      caching of lua scripts. [Daniel Gruno]
 
-  *) The following now respect DefaultRuntimeDir/DEFAULT_REL_RUNTIMEDIR:
-     - APIs: ap_log_pid(), ap_remove_pid, ap_read_pid()
-     - core: the scoreboard (ScoreBoardFile), pid file (PidFile), and
-       mutexes (Mutex)
-     - mod_auth_digest: shared memory file
-     - mod_lbmethod_heartbeat, mod_heartmonitor: heartbeat storage file
-     - mod_ldap: shared memory cache
-     - mod_socache_shmcb, mod_socache_dbm: shared memory or dbm for cache
-     [Jeff Trawick]
-
   *) mod_ssl: Add RFC 5878 support. [Ben Laurie]
 
   *) mod_lua: Add new directive LuaAuthzProvider to allow implementing an