Prep for 4.0.10 and 3.5.18

diff --git a/ChangeLog b/ChangeLog
index 9ddef6e3a90e49d5d0b1070027d05419b3b57cf6..9d8319c6edf5ce5c55f5eefd70f43864cfdab3c6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
+Changes to squid-4.0.10 (06 May 2016):
+
+       - Accumulate fewer unknown-size responses to avoid overwhelming disks.
+       - Fix shared memory corruption when storing multi-slot (>32KB) shm misses.
+       - ... and some documentation and code cleanup
+       - ... and all fixes from 3.5.18
+
 Changes to squid-4.0.9 (20 Apr 2016):
 
-       - Bug #4405: assertion failed: comm.cc:554: "Comm::IsConnOpen(conn)"
+       - Bug 4405: assertion failed: comm.cc:554: "Comm::IsConnOpen(conn)"
        - Add a new error page token for unquoted external ACL messages.
        - Stop parsing response prefix after discovering an "HTTP/0.9" response.
        - ... and some documentation updates
@@ -148,6 +155,16 @@ Changes to squid-4.0.1 (14 Oct 2015):
        - ... and many documentation changes
        - ... and much code cleanup and polishing
 
+Changes to squid-3.5.18 (06 May 2016):
+
+       - Bug 4510: stale comment about 32KB limit on shared memory cache entries
+       - Bug 4509: EUI compile error on NetBSD
+       - Bug 4501: HTTP/1.1: normalize Host header
+       - Bug 4498: URL-unescape the login-info after extraction from URI
+       - Bug 4455: SegFault from ESIInclude::Start
+       - Prevent Squid forcing -b 2048 into the arguments for sslcrtd_program
+       - Fix TLS/SSL server handshake alert handling
+
 Changes to squid-3.5.17 (20 Apr 2016):
 
        - Regression Bug 4480: logformat [.width_max]

diff --git a/doc/release-notes/release-3.5.sgml b/doc/release-notes/release-3.5.sgml
index a0191def38369d1becb02124759488e38358f892..7c9d25cd024602f5b799c7884ba1cbfb369c7796 100644 (file)
--- a/doc/release-notes/release-3.5.sgml
+++ b/doc/release-notes/release-3.5.sgml
@@ -1,6 +1,6 @@
 <!doctype linuxdoc system>
 <article>
-<title>Squid 3.5.17 release notes</title>
+<title>Squid 3.5.18 release notes</title>
 <author>Squid Developers</author>
 
 <abstract>
@@ -13,7 +13,7 @@ for Applied Network Research and members of the Web Caching community.
 
 <sect>Notice
 <p>
-The Squid Team are pleased to announce the release of Squid-3.5.17.
+The Squid Team are pleased to announce the release of Squid-3.5.18.
 
 This new release is available for download from <url url="http://www.squid-cache.org/Versions/v3/3.5/"> or the
  <url url="http://www.squid-cache.org/Download/http-mirrors.html" name="mirrors">.

diff --git a/doc/release-notes/release-4.sgml b/doc/release-notes/release-4.sgml
index 1e868ed9e0d9a75b11d004f1d10269f50dea3c09..f4ad326697309d77781a55184e5aa61a1bbee65c 100644 (file)
--- a/doc/release-notes/release-4.sgml
+++ b/doc/release-notes/release-4.sgml
@@ -1,6 +1,6 @@
 <!doctype linuxdoc system>
 <article>
-<title>Squid 4.0.9 release notes</title>
+<title>Squid 4.0.10 release notes</title>
 <author>Squid Developers</author>
 
 <abstract>
@@ -12,7 +12,7 @@ for Applied Network Research and members of the Web Caching community.
 <toc>
 
 <sect>Notice
-<p>The Squid Team are pleased to announce the release of Squid-4.0.9 for testing.
+<p>The Squid Team are pleased to announce the release of Squid-4.0.10 for testing.
 
 This new release is available for download from <url url="http://www.squid-cache.org/Versions/v4/"> or the
  <url url="http://www.squid-cache.org/Download/http-mirrors.html" name="mirrors">.