Note a backport.

PR:
Obtained from:
Submitted by:
Reviewed by:

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

diff --git a/CHANGES b/CHANGES
index 79cbee04c0056f48e5efc55161ca08ae73352e94..a9739c3f03724f02a593df4d7cfd32ed5605fea4 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -9,9 +9,6 @@ Changes with Apache 2.1.0-dev
   *) Alter mod_expires to run at a different filter priority to allow
      proper Expires storage by mod_cache.  [Justin Erenkrantz]
 
-  *) Fix the global mutex crash when the global mutex is never allocated due
-     to disabled/empty caches. [Jess Holle <jessh ptc.com>]
-
   *) Fix a segfault in the LDAP cache purge. [Jess Holle <jessh ptc.com>]
 
   *) mod_rewrite: Handle per-location rules when r->filename is unset.
@@ -421,6 +418,9 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.52
 
+  *) Fix the global mutex crash when the global mutex is never allocated due
+     to disabled/empty caches. [Jess Holle <jessh ptc.com>]
+
   *) SECURITY: CAN-2004-0811 (cve.mitre.org)
      Fix merging of the Satisfy directive, which was applied to
      the surrounding context and could allow access despite configured