Re-synch with 2.0 stable branch after backport.

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

diff --git a/CHANGES b/CHANGES
index 205a713fad031e0dedd9cd98d15940dc649a2c62..ae99db5bbc9dba95739a0d1d6f57f00498af6c75 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -59,10 +59,6 @@ Changes with Apache 2.1.0-dev
   *) Add forensic logging module (mod_log_forensic).
      [Ben Laurie]
 
-  *) Fix segfault in mod_mem_cache cache_insert() due to cache size
-     becoming negative.  PR: 21285, 21287
-     [Bill Stoddard, Massimo Torquati, Jean-Jacques Clar]
-
   *) mod_proxy with ProxyErrorOverride On in a reverse-proxy configuration attaches
      a body to the 302 response and a wrong Content-Length header. 
      PR: 22951 [Ermanno Scaglione scaglione ..at.. starnetone.de]
@@ -279,6 +275,10 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.49
 
+  *) Fix segfault in mod_mem_cache cache_insert() due to cache size
+     becoming negative.  PR: 21285, 21287
+     [Bill Stoddard, Massimo Torquati, Jean-Jacques Clar]
+
   *) core.c: If large file support is enabled, allow any file that is
      greater than AP_MAX_SENDFILE to be split into multiple buckets.
      This allows Apache to send files that are greater than 2gig.