From: Jeff Trawick <trawick@apache.org>
Date: Mon, 29 Jan 2007 17:55:04 +0000 (+0000)
Subject: sync with 2.2.x branch
X-Git-Tag: 2.3.0~1922
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=625b018e0857820abcd92acdcbb3493f2b96c0ee;p=apache

sync with 2.2.x branch


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

diff --git a/CHANGES b/CHANGES
index 10d3e58e87..4be72421b3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,10 +2,6 @@
 Changes with Apache 2.3.0
   [Remove entries to the current 2.0 and 2.2 section below, when backported]
 
-  *) Unix MPMs: Catch SIGFPE so that exception hooks and CoreDumpDirectory
-     can work after that terminating signal.
-     [Eric Covener <covener gmail.com>]
-
   *) mod_dbd: Create memory sub-pools for each DB connection and close
      DB connections in a pool cleanup function.  Ensure prepared statements
      are destroyed before DB connection is closed.  When using reslists,
@@ -256,6 +252,10 @@ Changes with Apache 2.3.0
 
 Changes with Apache 2.2.5
 
+  *) Unix MPMs: Catch SIGFPE so that exception hooks and CoreDumpDirectory
+     can work after that terminating signal.
+     [Eric Covener <covener gmail.com>]
+
   *) Win32: Makefile.win will now build with MS VC 8 (Visual Studio 2005)
      including embedding the .manifest information into each binary.
      [William Rowe]