From: Bill Stoddard <stoddard@apache.org>
Date: Thu, 15 May 2003 00:51:55 +0000 (+0000)
Subject: This patch is now in 2.0.46
X-Git-Tag: pre_ajp_proxy~1699
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=417154ce79ac3ced4e017575db981cf678e052c8;p=apache

This patch is now in 2.0.46


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

diff --git a/CHANGES b/CHANGES
index 45461313dc..f02a431bc4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -29,10 +29,6 @@ Changes with Apache 2.1.0-dev
   *) Fix a compile failure with recent OpenSSL and picky compilers
      (e.g., OpenSSL 0.9.7a and xlc_r on AIX).  [Jeff Trawick]
 
-  *) ap_get_mime_headers_core: allocate space for the trailing null
-     when folding is in effect.
-     PR 18170 [Peter Mayne <PeterMayne@SPAM_SUX.ap.spherion.com>]
-
   *) Do not bypass output filters when redirecting subrequests internally.
      PR 17629.  [André Malo]
 
@@ -153,6 +149,10 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.46
 
+  *) ap_get_mime_headers_core: allocate space for the trailing null
+     when folding is in effect.
+     PR 18170 [Peter Mayne <PeterMayne@SPAM_SUX.ap.spherion.com>]
+
   *) mod_log_config: Add the ability to log the id of the thread 
      processing the request via new %P formats.  [Jeff Trawick]