From: Paul Querna <pquerna@apache.org>
Date: Sat, 26 Feb 2005 09:04:51 +0000 (+0000)
Subject: sync with 2.0.x branch.
X-Git-Tag: 2.1.4~30
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=450529beca7a8b8f89765e24a1f960cd52093215;p=apache

sync with 2.0.x branch.


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

diff --git a/CHANGES b/CHANGES
index b7c718fe38..f5b9e32594 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,11 +7,6 @@ Changes with Apache 2.1.4
 
 Changes with Apache 2.1.3
 
-  *) core_input_filter: Move buckets to a persistent brigade instead of
-     creating a new brigade when apr_brigade_split is called. This stops
-     a memory leak when proxying a Streaming Media Server. PR 33382.
-     [Paul Querna]
-
   *) mod_ssl: Add ssl_ext_lookup optional function for accessing
      certificate extensions.   [David Reid, Joe Orton]
 
@@ -602,6 +597,10 @@ Changes with Apache 2.1.1
 
 Changes with Apache 2.0.54
 
+  *) core_input_filter: Move buckets to a persistent brigade instead of
+     creating a new brigade. This stop a memory leak when proxying a 
+     Streaming Media Server. PR 33382. [Paul Querna]
+
   *) mod_win32: Ignore both PATH_INFO as well as PATH_TRANSLATED to avoid 
      hiccups from additional path information passed in non-utf-8 format.
      [Richard Donkin <rd9 donkin.org]