From: Paul J. Reder <rederpj@apache.org>
Date: Tue, 3 Feb 2004 15:31:46 +0000 (+0000)
Subject: Re-synch with 2.0 stable branch after backport.
X-Git-Tag: pre_ajp_proxy~741
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4d2c2e551cfbdca34ca3cf7e317df433dcee6f3c;p=apache

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 205a713fad..ae99db5bbc 100644
--- 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.