From: Jim Jagielski <jim@apache.org>
Date: Tue, 8 Nov 2005 13:17:12 +0000 (+0000)
Subject: Note fixes that have been applied to the 2.1.10/2.2 BRANCH
X-Git-Tag: 2.3.0~2801
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=41a79e47cbab9c6c9159d22b5d9a23860f856523;p=apache

Note fixes that have been applied to the 2.1.10/2.2 BRANCH


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

diff --git a/CHANGES b/CHANGES
index 47fdad8d7b..688a41f5e0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,13 +6,6 @@ Changes with Apache 2.3.0
      handling of MKCOL.
      [Ruediger Pluem, Ghassan Misherghi <ghassanm ucdavis.edu>]
 
-  *) Fix DESTDIR=... installation when using bundled copy of APR.
-     [Torsten Foertsch <torsten.foertsch gmx.net>]
-
-  *) mod_proxy_balancer: When finding best worker, use case insensitive
-     match for scheme and host, but case sensitive for the rest of
-     the path. [Jim Jagielski, Ruediger Pluem]
-
   *) Asynchronous write completion for the Event MPM.  [Brian Pane]
 
   *) Added an End-Of-Request bucket type.  The logging of a request and
@@ -42,6 +35,15 @@ Changes with Apache 2.3.0
      access control, as in: SSLRequire "value" in OID("1.3.6.1.4.1.18060.1")
      [Martin Kraemer, David Reid]
 
+Changes with Apache 2.1.10
+
+  *) Fix DESTDIR=... installation when using bundled copy of APR.
+     [Torsten Foertsch <torsten.foertsch gmx.net>]
+
+  *) mod_proxy_balancer: When finding best worker, use case insensitive
+     match for scheme and host, but case sensitive for the rest of
+     the path. [Jim Jagielski, Ruediger Pluem]
+
 Changes with Apache 2.1.9
 
   *) mod_proxy_ajp: Do not spool the entire response from AJP backend before