backported

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

diff --git a/CHANGES b/CHANGES
index f83cd8d2a33f4d3f4b3493b5fab63a2ad0f90ba5..96339c80d221b83610c26b85c8ae6d18b56803bc 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -28,9 +28,6 @@ Changes with Apache 2.5.0
 
   *) EventOpt MPM
 
-  *) mod_proxy_balancer: Improve output
-     PR 52478 [Danijel <dt-ng rbfh de>]
-  
   *) core: Add LogLevelOverride directive that allows to override the
      loglevel for clients from certain IPs. This also works for things
      like the SSL handshake where <If> LogLevel ... </If> is evaluated
@@ -61,9 +58,6 @@ Changes with Apache 2.5.0
   *) mod_systemd: New module, for integration with systemd on Linux.
      [Jan Kaluza <jkaluza redhat.com>]
 
-  *) --with-module: Fix failure to integrate them into some existing
-     module directories.  PR 40097.  [Jeff Trawick]
-
   *) mod_cache_socache: New cache implementation backed by mod_socache
      that replaces mod_mem_cache removed from httpd v2.2. [Graham
      Leggett]
@@ -71,10 +65,6 @@ Changes with Apache 2.5.0
   *) core: Add dirwalk_stat and pre_htaccess hooks, allowing mpm-itk
      to be used without patches to httpd core.  [Jeff Trawick]
 
-  *) mod_proxy: Allow for persistence of local changes (via the
-     balancer-manager) between graceful and normal restarts.
-     [Jim Jagielski]
-
   *) mod_lua: Add LuaInputFilter/LuaOutputFilter for creating content
      filters in Lua [Daniel Gruno]
 

diff --git a/docs/manual/mod/mod_proxy.xml b/docs/manual/mod/mod_proxy.xml
index 8a626cc1ad316da20d3d3a3856ffb9ba4cad82ac..316918a028bee6e9654e3ce34ee9c6dd9b968d4a 100644 (file)
--- a/docs/manual/mod/mod_proxy.xml
+++ b/docs/manual/mod/mod_proxy.xml
@@ -670,7 +670,7 @@ expressions</description>
     <syntax>BalancerInherit On|Off</syntax>
     <default>BalancerInherit On</default>
     <contextlist><context>server config</context><context>virtual host</context></contextlist>
-    <compatibility>BalancerInherit is only available in Apache HTTP Server 2.5.0
+    <compatibility>BalancerInherit is only available in Apache HTTP Server 2.4.4 and later.
         and later.</compatibility>
     <usage>
         <p>This directive will cause the current server/vhost to "inherit" ProxyPass