Note 2 backports applied to 2.2.4-dev

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

diff --git a/CHANGES b/CHANGES
index 39253810f9d28b71befef784083747df1897e14d..08b24cefcdb5a627d4e75374147cc31d62b505e9 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -106,10 +106,6 @@ Changes with Apache 2.3.0
      now use ap_get_server_banner() or ap_get_server_description().
      [Jeff Trawick]
 
-  *) mod_proxy_balancer: Extract stickysession routing information contained as
-     parameter in the URL correctly. PR 40400.
-     [Ruediger Pluem, Tomokazu Harada <harada sysrdc.ns-sol.co.jp>]
-
   *) mod_deflate: Rework inflate output and deflate output filter to fix several
      issues: Incorrect handling of flush buckets, potential memory leaks,
      excessive memory usage in inflate output filter for large compressed
@@ -122,9 +118,6 @@ Changes with Apache 2.3.0
      and format messages for both the console and the error log, as
      appropriate.  [Chris Darroch]
 
-  *) mod_proxy: Don't try to use dead backend connection. PR 37770.
-     [Olivier BOEL <ob dorrboel.com>]
-
   *) mod_proxy: don't URLencode tilde in path component
      [Stijn Hoop <stijn sandcat.nl>]
 
@@ -272,6 +265,13 @@ Changes with Apache 2.3.0
 
 Changes with Apache 2.2.4
 
+  *) mod_proxy: Don't try to use dead backend connection. PR 37770.
+     [Olivier BOEL <ob dorrboel.com>]
+
+  *) mod_proxy_balancer: Extract stickysession routing information contained as
+     parameter in the URL correctly. PR 40400.
+     [Ruediger Pluem, Tomokazu Harada <harada sysrdc.ns-sol.co.jp>]
+
   *) mod_cache: From RFC3986 (section 6.2.3.) if a URI contains an
      authority component and an empty path, the empty path is to be equivalent
      to "/". It explicitly cites the following four URIs as equivalents: