From: Jeff Trawick <trawick@apache.org>
Date: Fri, 8 Dec 2006 12:41:46 +0000 (+0000)
Subject: sync with 2.2.x branch
X-Git-Tag: 2.3.0~1989
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e95d7332bf7ae994ae8a7a63d0baca7b01178112;p=apache

sync with 2.2.x branch


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

diff --git a/CHANGES b/CHANGES
index ec68b92694..6fbc586229 100644
--- a/CHANGES
+++ b/CHANGES
@@ -82,10 +82,6 @@ Changes with Apache 2.3.0
 
   *) mod_rewrite: support rewritemap by SQL query [Nick Kew]
 
-  *) Fix issue which could cause piped loggers to be orphaned and never
-     terminate after a graceful restart.  PR 40651.  [Joe Orton,
-     Ruediger Pluem]
-
   *) mod_headers: support regexp-based editing of HTTP headers [Nick Kew]
 
   *) mod_cache: Eliminate a bogus error in the log when a filter returns
@@ -263,6 +259,10 @@ Changes with Apache 2.3.0
 
 Changes with Apache 2.2.4
 
+  *) Fix issue which could cause piped loggers to be orphaned and never
+     terminate after a graceful restart.  PR 40651.  [Joe Orton,
+     Ruediger Pluem]
+
   *) Fix address-in-use startup failure caused by corruption of the list of
      listen sockets in some configurations with multiple generic Listen
      directives.  [Jeff Trawick]