From: Graham Leggett <minfrin@apache.org>
Date: Thu, 23 Sep 2004 17:35:46 +0000 (+0000)
Subject: Note a backport.
X-Git-Tag: 2.1.1~211
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5981d5f5546fddef5c85c0c4ef962c2daf1a6b90;p=thirdparty%2Fapache%2Fhttpd.git

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 79cbee04c00..a9739c3f037 100644
--- 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