From: Joe Orton <jorton@apache.org>
Date: Wed, 10 Nov 2004 13:00:32 +0000 (+0000)
Subject: Synch history with 2.0 branch.
X-Git-Tag: 2.1.1~35
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2e0cf270094faa8f1f0afa5e675426845c5da44c;p=apache

Synch history with 2.0 branch.


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

diff --git a/CHANGES b/CHANGES
index 86957c33df..64ead43280 100644
--- a/CHANGES
+++ b/CHANGES
@@ -517,8 +517,13 @@ Changes with Apache 2.0.53
 
 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>]
+  *) Use HTML 2.0 <hr> for error pages. PR 30732 [André Malo]
+
+  *) 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 when it is configured switched
+     off. [Jess Holle <jessh ptc.com>]
 
   *) SECURITY: CAN-2004-0811 (cve.mitre.org)
      Fix merging of the Satisfy directive, which was applied to
@@ -542,6 +547,18 @@ Changes with Apache 2.0.52
 
 Changes with Apache 2.0.51
 
+  *) SECURITY: CAN-2004-0786 (cve.mitre.org)
+     Fix an input validation issue in apr-util which could be
+     triggered by malformed IPv6 literal addresses.  [Joe Orton]
+
+  *) SECURITY: CAN-2004-0747 (cve.mitre.org)
+     Fix buffer overflow in expansion of environment variables in
+     configuration file parsing.  [André Malo]
+
+  *) SECURITY: CAN-2004-0809 (cve.mitre.org)
+     mod_dav_fs: Fix a segfault in the handling of an indirect lock
+     refresh.  PR 31183.  [Joe Orton]
+
   *) mod_include no longer checks for recursion, because that's done
      in the core. This allows for careful usage of recursive SSI.
      [André Malo]