From: Jeff Trawick <trawick@apache.org>
Date: Thu, 2 Sep 2004 11:20:53 +0000 (+0000)
Subject: sync
X-Git-Tag: 2.1.1~376
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=972df61bd1adeb595a9c138627b65962ff701ad2;p=thirdparty%2Fapache%2Fhttpd.git

sync


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

diff --git a/CHANGES b/CHANGES
index 9ffc5f59be7..17430941ca6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -97,10 +97,6 @@ Changes with Apache 2.1.0-dev
   *) mod_deflate: support gzip flags in inflate_out_filter
      [Nick Kew <nick webthing.com>]
 
-  *) mod_log_config: Fix a bug which prevented request completion time
-     from being logged for I_INSIST_ON_EXTRA_CYCLES_FOR_CLF_COMPLIANCE
-     processing.  PR 29696.  [Alois Treindl <alois astro.ch>]
-
   *) Add -l option to rotatelogs to let it use local time rather than
      UTC.  PR 24417.  [Ken Coar, Uli Zappe <uli ritual.org>]
 
@@ -405,6 +401,10 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.51
 
+  *) mod_log_config: Fix a bug which prevented request completion time
+     from being logged for I_INSIST_ON_EXTRA_CYCLES_FOR_CLF_COMPLIANCE
+     processing.  PR 29696.  [Alois Treindl <alois astro.ch>]
+
   *) mod_include no longer checks for recursion, because that's done
      in the core. This allows for careful usage of recursive SSI.
      [André Malo]