From: Jeff Trawick <trawick@apache.org>
Date: Sat, 4 Sep 2004 11:43:34 +0000 (+0000)
Subject: sync
X-Git-Tag: 2.1.1~363
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e4fa99cb1806422756457cee56ba0fe91b5cdc8c;p=apache

sync


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

diff --git a/CHANGES b/CHANGES
index a614afc3ec..6de88825cc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -101,9 +101,6 @@ Changes with Apache 2.1.0-dev
   *) mod_deflate: support gzip flags in inflate_out_filter
      [Nick Kew <nick webthing.com>]
 
-  *) Add -l option to rotatelogs to let it use local time rather than
-     UTC.  PR 24417.  [Ken Coar, Uli Zappe <uli ritual.org>]
-
   *) Drop the ErrorHeader directive which turned out to be a misnomer.
      Instead there's a new optional flag for the Header directive
      ('always'), which keeps the former ErrorHeader functionality.
@@ -405,6 +402,9 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.51
 
+  *) Add -l option to rotatelogs to let it use local time rather than
+     UTC.  PR 24417.  [Ken Coar, Uli Zappe <uli ritual.org>]
+
   *) 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>]