move the entry for a fix just merged into 2.0.48-dev

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

diff --git a/CHANGES b/CHANGES
index ff99fba9fdc0f7640d0ccd5ce6d5a60c87402945..bb110c0cbd6ed272640bfda9d07530c83479ea6e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -26,11 +26,6 @@ Changes with Apache 2.1.0-dev
      This fixes a log corruption issue when flock-based serialization
      is used (e.g., FreeBSD).  [Jeff Trawick]
 
-  *) Don't respect the Server header field as set by modules and CGIs.
-     As with 1.3, for proxy requests any such field is from the origin 
-     server; otherwise it will have our server info as controlled by
-     the ServerTokens directive.  [Jeff Trawick]
-
   *) Fix some broken log messages in WinNT MPM.  
      [Juan Rivera <Juan.Rivera@citrix.com>]
 
@@ -158,6 +153,13 @@ Changes with Apache 2.1.0-dev
   [Apache 2.1.0-dev includes those bug fixes and changes with the
    Apache 2.0.xx tree as documented, and except as noted, below.]
 
+Changes with Apache 2.0.48
+
+  *) Don't respect the Server header field as set by modules and CGIs.
+     As with 1.3, for proxy requests any such field is from the origin 
+     server; otherwise it will have our server info as controlled by
+     the ServerTokens directive.  [Jeff Trawick]
+
 Changes with Apache 2.0.47
 
   *) Prevent the server from crashing when entering infinite loops. The