Merged Squid-2.4 changelogs

diff --git a/ChangeLog b/ChangeLog
index 2d32603f33b4e19796c06b95a39c5552cd46a37c..a62589f89b54155f066bffb28b92fa830d854d10 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,7 +34,19 @@ Changes to squid-2.5 ():
        - Added SSL gatewaying support, allowing Squid to act as a SSL server
          in accelerator setups.
        - Countless other small things and fixes
-       
+
+Changes to Squid-2.4.STABLE6 (March 19, 2002):
+
+       - The patch for 2.4.STABLE5 was insufficnetly tested and
+         introduced a bug that causes frequent assertions when
+         handling DNS PTR answers.
+
+Changes to Squid-2.4.STABLE5 (March 15, 2002):
+
+       - Fixed an array bounds bug in lib/rfc1035.c.  This bug
+         could allow a malicious DNS server to send bogus replies
+         and corrupt the heap memory.
+
 Changes to Squid-2.4.STABLE4 (Feb 19, 2002)
 
        - htcp_port 0 now properly disabled htcp