note a backport; don't forget that trunk had an additional

change


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

1 files changed, 9 insertions, 5 deletions

diff --git a/CHANGES b/CHANGES
index be3e3d83b3..29ade03689 100644
--- a/CHANGES
+++ b/CHANGES
@@ -9,11 +9,9 @@ Changes with Apache 2.3.0
      statically like the older support programs.
      [Eric Covener <covener gmail.com>]
 
-  *) The full server version information is now included in the error log at
-     startup as well as server status reports, irrespective of the setting
-     of the ServerTokens directive.  Third-party modules must now use
-     ap_get_server_banner() or ap_get_server_description() in place of 
-     ap_get_server_version().  [Jeff Trawick]
+  *) ap_get_server_version() has been removed.  Third-party modules must 
+     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.
@@ -198,6 +196,12 @@ Changes with Apache 2.3.0
 
 Changes with Apache 2.2.4
 
+  *) The full server version information is now included in the error log at
+     startup as well as server status reports, irrespective of the setting
+     of the ServerTokens directive.  ap_get_server_version() is now 
+     deprecated, and is replaced by ap_get_server_banner() and 
+     ap_get_server_description().  [Jeff Trawick]
+
   *) mod_proxy_balancer: Workers can now be defined as part of
      a balancer cluster "set" in which members of a lower-numbered set
      are preferred over higher numbered ones. [Jim Jagielski]