From: André Malo <nd@apache.org>
Date: Sat, 24 Apr 2004 11:53:37 +0000 (+0000)
Subject: sync
X-Git-Tag: pre_ajp_proxy~328
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bccb1c6e902c4a97469dccf2107e1f5e63ae5d71;p=apache

sync


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

diff --git a/CHANGES b/CHANGES
index 8a1ba1f4ff..05cdd4fa21 100644
--- a/CHANGES
+++ b/CHANGES
@@ -28,9 +28,6 @@ Changes with Apache 2.1.0-dev
 
   *) mod_headers: Allow 'echo' also for ErrorHeaders.  [André Malo]
 
-  *) mod_headers no longer crashes if an empty header value should
-     be added.  [André Malo]
-
   *) mod_cgi: Handle output on stderr during script execution on Unix
      platforms; preventing deadlock when stderr output fills pipe buffer.
      PR 22030.  [Joe Orton, Jeff Trawick]
@@ -71,9 +68,6 @@ Changes with Apache 2.1.0-dev
   *) Allow RequestHeader directives to be conditional. PR 27951.
      [Vincent Deffontaines <vincent gryzor.com>, André Malo]
 
-  *) Fix segfault in mod_expires, which occured under certain
-     circumstances. PR 28047.  [André Malo]
-
   *) mod_logio no longer removes the EOS bucket. PR 27928.
      [Bojan Smojver <bojan rexursive.com>]
 
@@ -361,6 +355,12 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.50
 
+  *) mod_headers no longer crashes if an empty header value should
+     be added.  [André Malo]
+
+  *) Fix segfault in mod_expires, which occured under certain
+     circumstances. PR 28047.  [André Malo]
+
   *) htpasswd: use apr_temp_dir_get() and general cleanup
      [Guenter Knauf <eflash gmx.net>, Thom May]