From: Ruediger Pluem <rpluem@apache.org>
Date: Sat, 4 Feb 2006 21:44:01 +0000 (+0000)
Subject: * sync with 2.2.x CHANGES
X-Git-Tag: 2.3.0~2561
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff0416db8305c85986583a6bf1b49ac0b1d831d0;p=thirdparty%2Fapache%2Fhttpd.git

* sync with 2.2.x CHANGES


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

diff --git a/CHANGES b/CHANGES
index d00490bbca6..1052c63163d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -47,9 +47,6 @@ Changes with Apache 2.3.0
      seconds to cache a document.
      [Brian Akins <brian.akins turner.com>, Ruediger Pluem]
 
-  *) mod_cache: Make caching of reverse proxies possible again. PR 38017.
-     [Ruediger Pluem]
-
   *) Refactored ap_read_request() to provide a foundation for
      nonblocking reads of requests.  [Brian Pane]
 
@@ -106,6 +103,9 @@ Changes with Apache 2.2.1
      made to ap_escape_html so we escape quotes.  Reported by JPCERT.
      [Mark Cox]
 
+  *) mod_cache: Make caching of reverse proxies possible again. PR 38017.
+     [Ruediger Pluem]
+
   *) Modify apr[util] .h detection to avoid breakage on VPATH builds
      using Solaris make (amoung others) and avoid breakage in ./buildconf
      when srclib/apr[-util] are symlinks rather than directories proper.