sync with stable branch

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

diff --git a/CHANGES b/CHANGES
index e9b8035182ff7470cff53de9f6ff79f1dbd3fc71..71468f0fb77daf3b083f5ddf979950ef32ddb0ff 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,9 +5,6 @@ Changes with Apache 2.1.0-dev
   *) Fixed file extensions for real media files and removed rpm extension
      from mime.types. PR 26079.  [Allan Sandfeld <kde carewolf.com>]
 
-  *) worker MPM: fix stack overlay bug that could cause the parent
-     process to crash.  [Jeff Trawick]
-
   *) Unix MPMs: Stop dropping connections when the file descriptor
      is at least FD_SETSIZE.  [Jeff Trawick]
 
@@ -290,6 +287,9 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.49
 
+  *) worker MPM: fix stack overlay bug that could cause the parent
+     process to crash.  [Jeff Trawick]
+
   *) Win32: Add Win32DisableAcceptEx directive. This Windows
      NT/2000/CP directive is useful to work around bugs in some 
      third party layered service providers like virus scanners,