From: Jeff Trawick <trawick@apache.org>
Date: Tue, 29 Mar 2005 08:44:53 +0000 (+0000)
Subject: sync with 2.0.54-dev
X-Git-Tag: 2.1.5~256
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4eb1bbd31b243b413830afbb5b9af761b5833cab;p=thirdparty%2Fapache%2Fhttpd.git

sync with 2.0.54-dev


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

diff --git a/CHANGES b/CHANGES
index 898e131c0b5..1cd4ecd5cd1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -57,10 +57,6 @@ Changes with Apache 2.1.3
   *) Only recompile buildmark.c when we have to relink httpd.
      [Justin Erenkrantz]
 
-  *) Remove formatting characters from ap_log_error() calls.  These
-     were escaped as fallout from CAN-2003-0020.
-     [Eric Covener <ecovener gmail.com>]
-
   *) mod_cache: Fix up handling of revalidated responses.
      [Justin Erenkrantz]
 
@@ -631,6 +627,10 @@ Changes with Apache 2.1.1
 
 Changes with Apache 2.0.54
 
+  *) Remove formatting characters from ap_log_error() calls.  These
+     were escaped as fallout from CAN-2003-0020.
+     [Eric Covener <ecovener gmail.com>]
+
   *) htdigest: Fix permissions of created files.  PR 33765.  [Joe Orton]
 
   *) core_input_filter: Move buckets to a persistent brigade instead of