From: Ruediger Pluem <rpluem@apache.org>
Date: Thu, 6 Oct 2005 21:34:13 +0000 (+0000)
Subject: * Sync with 2.2.x branch (r306900)
X-Git-Tag: 2.3.0~2899
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f3a704a9ff1668b8e84c42fbfd7dd2641dec2c82;p=apache

* Sync with 2.2.x branch (r306900)


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

diff --git a/CHANGES b/CHANGES
index cc1932ce57..ab40672158 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,10 +2,6 @@
 Changes with Apache 2.3.0
   [Remove entries to the current 2.0 and 2.2 section below, when backported]
 
-  *) mod_proxy: Run the request_status hook also if there are no free workers
-     or all workers are in error state.
-     [Ruediger Pluem, Brian Akins <brian.akins turner.com>]
-
   *) Move mod_dbd to /modules/database/ [Nick Kew]
 
   *) Move mod_filter and mod_charset_lite to /modules/filters/ [Nick Kew]
@@ -28,6 +24,10 @@ Changes with Apache 2.3.0
 
 Changes with Apache 2.1.9
 
+  *) mod_proxy: Run the request_status hook also if there are no free workers
+     or all workers are in error state.
+     [Ruediger Pluem, Brian Akins <brian.akins turner.com>]
+
   *) mod_proxy_balancer: mod_proxy_balancer does not handle sticky sessions
      with tomcat correctly. PR36507. [Ruediger Pluem]