Prep for 4.0.14 and 3.5.21

diff --git a/ChangeLog b/ChangeLog
index ef0ca3c39fb06e99bcb4bd4ec177493d44dd21ac..53555cf52cc99cbdbe6f8a149f463b7bb3f4d4ac 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+Changes to squid-4.0.14 (08 Sep 2016):
+
+       - Regression Bug 4570: crash after rev.14755
+       - Regression Bug 4561: Replace use of default move operators with explicit implementation
+       - Bug 4503: Do not access-log SslBump-faked CONNECTs with _ABORTED suffixes
+       - Bug 4404: Do not access-log chunked non-persistent responses with _ABORTED suffix
+       - Fix crashes on shutdown while cleaning up idle ICAP connections
+       - Fix logformat unable to configure codes with /-escape
+       - HTTP: MUST respond with 414 (URI Too Long) when request-target exceeds limits
+       - HTTP: validate Content-Length header values
+       - Make Squid death due to overloaded helpers optional
+       - Better support for unknown URL schemes
+       - Do not log error:transaction-end-before-headers after invalid requests
+       - ... and many portability and build fixes
+       - ... and some documentation updates
+       - ... and all fixes from 3.5.20
+
 Changes to squid-4.0.13 (05 Aug 2016):
 
        - Regression Bug 4540: revert r14720 buffer update
@@ -206,6 +223,19 @@ Changes to squid-4.0.1 (14 Oct 2015):
        - ... and many documentation changes
        - ... and much code cleanup and polishing
 
+Changes to squid-3.5.21 (08 Sep 2016):
+
+       - Bug 4563: duplicate code in httpMakeVaryMark
+       - Bug 4542: authentication credentials IP TTL updated incorrectly
+       - Bug 4534: assertion failure in xcalloc when using many cache_dir
+       - Bug 4428: mal-formed Cache-Control:stale-if-error header
+       - Bug 3025: Proxy-Authenticate problem using ICAP server
+       - Fix segfault via Ftp::Client::readControlReply()
+       - Fix SSL-Bump failure results in SEGFAULT
+       - HTTP/1.1: MUST always revalidate Cache-Control:no-cache responses
+       - HTTP/1.1: do not allow Proxy-Connection to override Connection header
+       - SSL: CN wildcard must only match a single domain component [fragment]
+
 Changes to squid-3.5.20 (01 Jul 2016):
 
        - Bug 4523: smblib compile fails on NetBSD

diff --git a/doc/release-notes/release-3.5.sgml b/doc/release-notes/release-3.5.sgml
index 7f58f9e56fce5bab997e5055f82c82c3fb94c83a..ebb0f21eee64726ce5a4cb7ea48837c463d9b196 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.20 release notes</title>
+<title>Squid 3.5.21 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.20.
+The Squid Team are pleased to announce the release of Squid-3.5.21.
 
 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 9a4ea11cf54ce6961ad4ae5d46e0899343a95732..d9db68c7a8b5d8d80c4137e53c668cd07b97d3a6 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.13 release notes</title>
+<title>Squid 4.0.14 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.13 for testing.
+<p>The Squid Team are pleased to announce the release of Squid-4.0.14 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">.