svn commit: r472116 - /httpd/httpd/trunk/CHANGES

[ji...@apache.org]

Author: jim
Date: Tue Nov  7 05:51:46 2006
New Revision: 472116

URL: http://svn.apache.org/viewvc?view=rev&rev=472116
Log:
Note 2 backported ports applied to 2.2.4-dev

Modified:
    httpd/httpd/trunk/CHANGES

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?view=diff&rev=472116&r1=472115&r2=472116
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Tue Nov  7 05:51:46 2006
@@ -90,11 +90,6 @@
   *) 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 @@
      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 
@@ -264,6 +255,15 @@
      [Martin Kraemer, David Reid]
 
 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>]