sync with APACHE_2_0_BRANCH

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

diff --git a/CHANGES b/CHANGES
index b7f0030f0650d117fc51981453a00832cbb26452..62c2a8f1d68aff502a7da3264345aa0884135e07 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -16,9 +16,6 @@ Changes with Apache 2.1.0-dev
      is set in r->subprocess_env allow mismatched query strings to pass.
      PR 27758.  [Paul Querna <chip force-elite.com>, Geoffrey Young]
 
-  *) logresolve: Allow size of log line buffer to be overridden at
-     build time (MAXLINE).  PR 27793.  [Jeff Trawick]
-
   *) mod_dav: Fix a problem that could cause crashes when manipulating 
      locks on some platforms.  [Jeff Trawick]
 
@@ -295,6 +292,9 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.50
 
+  *) logresolve: Allow size of log line buffer to be overridden at
+     build time (MAXLINE).  PR 27793.  [Jeff Trawick]
+
   *) Fix the comment delimiter in htdbm so that it correctly parses the 
      username comment.  Also add a terminate function to allow NetWare 
      to pause the output before the screen is destroyed.