sync with stable branch

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

diff --git a/CHANGES b/CHANGES
index 970bcad3f869d1e5deaa8fc0d85e10a025328f26..42c89c78e1b068e86bb15087b6d47a698128d8fe 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -133,11 +133,6 @@ Changes with Apache 2.1.0-dev
   *) prefork MPM: Use the right permissions for the directory created 
      for gprof support.  [Jim Carlson <jcarlson jnous.com>]
 
-  *) Fix the inability to log errors like exec failure in
-     mod_ext_filter/mod_cgi script children.  This was broken after 
-     such children stopped inheriting the error log handle.  
-     [Jeff Trawick]
-
   *) Fix a compile failure with recent OpenSSL and picky compilers
      (e.g., OpenSSL 0.9.7a and xlc_r on AIX).  [Jeff Trawick]
 
@@ -240,6 +235,11 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.49
 
+  *) Fix the inability to log errors like exec failure in
+     mod_ext_filter/mod_cgi script children.  This was broken after 
+     such children stopped inheriting the error log handle.  
+     [Jeff Trawick]
+
   *) Fix mod_info to use the real config file name, not the default
      config file name.  [Aryeh Katz <aryeh secured-services.com>]