From: Jeff Trawick <trawick@apache.org>
Date: Thu, 17 Apr 2003 02:59:02 +0000 (+0000)
Subject: reflect a change merged into 2.0.46-dev
X-Git-Tag: pre_ajp_proxy~1837
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd123c9499c9b548c990759ff0f3f158c9560cec;p=thirdparty%2Fapache%2Fhttpd.git

reflect a change merged into 2.0.46-dev


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

diff --git a/CHANGES b/CHANGES
index b655940f1fc..9e796386ad7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -22,11 +22,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]
 
-  *) Fix a build problem with passing unsupported --enable-layout
-     args to apr and apr-util.  This broke binbuild.sh as well as
-     user-specified layout parameters.  PR 18649 [Justin Erenkrantz,
-     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>]
@@ -168,6 +163,11 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.46
 
+  *) Fix a build problem with passing unsupported --enable-layout
+     args to apr and apr-util.  This broke binbuild.sh as well as
+     user-specified layout parameters.  PR 18649 [Justin Erenkrantz,
+     Jeff Trawick]
+
   *) If a Date response header was already set in the headers array,
      this value was ignored in favour of the current time. This meant
      that Date headers on proxied requests where rewritten when they