From: Jeff Trawick <trawick@apache.org>
Date: Tue, 13 May 2003 16:55:13 +0000 (+0000)
Subject: merge back a fix
X-Git-Tag: pre_ajp_proxy~1710
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=713b4db67e37a5948211c6c0b9977b6bc99ad502;p=thirdparty%2Fapache%2Fhttpd.git

merge back a fix


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

diff --git a/CHANGES b/CHANGES
index 1f8ef91cbf1..e67f408b502 100644
--- a/CHANGES
+++ b/CHANGES
@@ -33,10 +33,6 @@ Changes with Apache 2.1.0-dev
   *) mod_log_config: Add the ability to log the id of the thread 
      processing the request via new %P formats.  [Jeff Trawick]
 
-  *) Fix a problem that caused httpd to linked with incorrect flags
-     on some platforms when mod_so was enabled by default, breaking 
-     DSOs on AIX.  PR 19012  [Jeff Trawick]
-
   *) ssl_toolkit_compat.h and code fixes to build clean on SSLC.
      [William Rowe, Madhusudan Mathihalli]
 
@@ -172,6 +168,10 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.46
 
+  *) Fix a problem that caused httpd to be linked with incorrect flags
+     on some platforms when mod_so was enabled by default, breaking 
+     DSOs on AIX.  PR 19012  [Jeff Trawick]
+
   *) By default, use the same CC and CPP with which APR was built.
      The user can override with CC and CPP environment variables.
      [Jeff Trawick]