From: Jim Jagielski <jim@apache.org>
Date: Mon, 28 Aug 2006 16:38:01 +0000 (+0000)
Subject: These have been approved for backport and or in/will be in
X-Git-Tag: 2.3.0~2145
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9b6976383284dfb67ce858c5ec261d0465761731;p=apache

These have been approved for backport and or in/will be in
2.2.4


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

diff --git a/CHANGES b/CHANGES
index 4b75b91516..c895a53303 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,9 +7,6 @@ Changes with Apache 2.3.0
      excessive memory usage in inflate output filter for large compressed
      content. PR 39854. [Ruediger Pluem, Nick Kew, Justin Erenkrantz]
 
-  *) mod_proxy_ajp: Close connection to backend if reading of request body
-     fails. PR 40310. [Ian Abel <ianabel mxtelecom.com>]
-
   *) All MPMs: Introduce a check_config phase between pre_config and
      open_logs, to allow modules to review interdependent configuration
      directive values and adjust them while messages can still be logged
@@ -65,10 +62,6 @@ Changes with Apache 2.3.0
      about the useless use of AllowOverride. PR 39992.
      [Darryl Miles <darryl darrylmiles.org>]
 
-  *) mod_proxy_balancer: Retry worker chosen by route / redirect worker if
-     it is in error state before sending "Service Temporarily Unavailable".
-     PR 38962. [Christian Boitel <cboitel lfdj.com>]
-
   *) mod_proxy_balancer: Add information about the route, the sticky session
      and the worker used during a request as environment variables. PR 39806.
      [Brian <brectanu gmail.com>]
@@ -192,6 +185,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.2.4
+
+  *) mod_proxy_ajp: Close connection to backend if reading of request body
+     fails. PR 40310. [Ian Abel <ianabel mxtelecom.com>]
+
+  *) mod_proxy_balancer: Retry worker chosen by route / redirect worker if
+     it is in error state before sending "Service Temporarily Unavailable".
+     PR 38962. [Christian Boitel <cboitel lfdj.com>]
+
 Changes with Apache 2.2.3
 
   *) mod_authn_alias: Add a check to make sure that the base provider and the