Prep for 4.0.21

diff --git a/ChangeLog b/ChangeLog
index 9388e28f55e3ab048f6761cdf2c675787f98f917..424dae6fba10c9eecc768900e483cf734773d64d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+Changes to squid-4.0.21 (02 Jul 2017):
+
+       - Bug 4730: segfault while processing internal HTTP requests
+       - Bug 4492: Chunk extension parser is too pedantic
+       - Bug 1961: Redesign urlParse() API
+       - TLS: recognise tls:: namespace on logformat tokens
+       - SSL-Bump: tproxy does not spoof spliced connections
+       - security_file_certgen: collapse queued requests
+       - Add a basic apparmour profile
+       - Add transaction_initiator ACL for detecting various unusual transactions
+       - Add ssl::server_name options to control matching logic
+       - Support for --long-acl-options
+       - Do not die silently when dying via std::terminate()
+       - Fix option --foreground to implement expected behavior
+       - Translations: update .po and .pot to latest texts
+       - ... and some documentation updates
+       - ... and many code cleanup and stability fixes
+       - ... and all fixes from 3.5.27
+
 Changes to squid-4.0.20 (01 Jun 2017):
 
        - Bug #4692: SslBump breaks intercepted IPv6 connections
@@ -16,7 +35,7 @@ Changes to squid-4.0.20 (01 Jun 2017):
        - ext_session_acl: cope with new logformat inputs
        - ... and some documentation updates
        - ... and some code stability fixes
-       - ... and all fixes from 3.5.25
+       - ... and all fixes from 3.5.26
 
 Changes to squid-4.0.19 (02 Apr 2017):
 

diff --git a/doc/release-notes/release-4.sgml b/doc/release-notes/release-4.sgml
index f81ba993bf58bc587478d182dc9b8a727a80a30f..a63a8e485dbdd4d2374d27209c6bfab00dc7fe47 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.20 release notes</title>
+<title>Squid 4.0.21 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.20 for testing.
+<p>The Squid Team are pleased to announce the release of Squid-4.0.21 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">.
@@ -259,6 +259,11 @@ This section gives a thorough account of those changes in three categories:
           including messages received from ICAP servers.
        <p>New <em>has</em> type for matching whether or not Squid is able to provide
          certain sets of transaction state. For example HTTP reply headers.
+       <p>New <em>transaction_initiator</em> type for detecting various
+          unusual transactions.
+       <p>New <em>--consensus</em>, <em>--client-requested</em> and
+          <em>--server-provided</em> flags for the <em>ssl::server_name</em>
+          type to control which server name to match against.
 
        <tag>auth_param</tag>
        <p>New parameter <em>queue-size=</em> to set the maximum number