From: Jeff Trawick <trawick@apache.org>
Date: Sat, 21 May 2005 12:25:35 +0000 (+0000)
Subject: sync
X-Git-Tag: 2.1.5~86
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1e83d2e66900f9fe2e44c8a731657d3095103702;p=apache

sync


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

diff --git a/CHANGES b/CHANGES
index f4a3f2dbb9..3e11cfa511 100644
--- a/CHANGES
+++ b/CHANGES
@@ -153,11 +153,6 @@ Changes with Apache 2.1.3
   *) mod_proxy: Fix ProxyRemoteMatch directive.  PR 33170.
      [Rici Lake <rici ricilake.net>]
 
-  *) proxy HTTP: Rework the handling of request bodies to handle
-     chunked input and input filters which modify content length, and
-     avoid spooling arbitrary-sized request bodies in memory.
-     PR 15859.  [Jeff Trawick]
-
   *) mod_proxy: Fix incorrect decoding/unescaping for reverse proxies.
      PR 32459, 15207. [Jim Jagielski]
 
@@ -691,6 +686,13 @@ Changes with Apache 2.1.1
   [Apache 2.1.0-dev includes those bug fixes and changes with the
    Apache 2.0.xx tree as documented, and except as noted, below.]
 
+Changes with Apache 2.0.55
+  
+  *) proxy HTTP: Rework the handling of request bodies to handle
+     chunked input and input filters which modify content length, and
+     avoid spooling arbitrary-sized request bodies in memory.
+     PR 15859.  [Jeff Trawick]
+
 Changes with Apache 2.0.54
 
   *) mod_cache: Add CacheIgnoreHeaders directive.  PR 30399.