Note 2 backported ports applied to 2.2.4-dev

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

diff --git a/CHANGES b/CHANGES
index 08b24cefcdb5a627d4e75374147cc31d62b505e9..aee5c7f6b396ccb4e8944f1e5a716a44928e2a94 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -90,11 +90,6 @@ Changes with Apache 2.3.0
   *) mod_mem_cache: Memory leak fix: Unconditionally free the buffer.
      [Davi Arnaut <davi haxent.com.br>]
 
-  *) mod_proxy_balancer: Set the new environment variable BALANCER_ROUTE_CHANGED
-     if a worker with a route different from the one supplied by the client
-     had been chosen or if the client supplied no routing information for
-     a balancer with sticky sessions. [Ruediger Pluem]
-
   *) mod_proxy: Print the correct error message for erroneous configured
      ProxyPass directives. PR 40439. [serai lans-tv.com]
 
@@ -154,10 +149,6 @@ Changes with Apache 2.3.0
      about the useless use of AllowOverride. PR 39992.
      [Darryl Miles <darryl darrylmiles.org>]
 
-  *) 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>]
-
   *) New SSLLogLevelDebugDump [ None (default) | IO (not bytes) | Bytes ]
      configures the I/O Dump of SSL traffic, when LogLevel is set to Debug.
      The default is none as this is far greater debugging resolution than 
@@ -265,6 +256,15 @@ Changes with Apache 2.3.0
 
 Changes with Apache 2.2.4
 
+  *) mod_proxy_balancer: Set the new environment variable BALANCER_ROUTE_CHANGED
+     if a worker with a route different from the one supplied by the client
+     had been chosen or if the client supplied no routing information for
+     a balancer with sticky sessions. [Ruediger Pluem]
+
+  *) 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>]
+
   *) mod_proxy: Don't try to use dead backend connection. PR 37770.
      [Olivier BOEL <ob dorrboel.com>]