4.0.20

diff --git a/ChangeLog b/ChangeLog
index e96b133c6434412b68768d17c1d59d422102a84f..9388e28f55e3ab048f6761cdf2c675787f98f917 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+Changes to squid-4.0.20 (01 Jun 2017):
+
+       - Bug #4692: SslBump breaks intercepted IPv6 connections
+       - Bug #4682: ignoring http_access deny when client-first bumping mode is used
+       - Bug #4662: build errors with LibreSSL 2.4.4
+       - Bug #4659: sslproxy_foreign_intermediate_certs does not work
+       - Bug #4321: ssl_bump terminate does not terminate at step1
+       - Add 'has' ACL
+       - Do not forward HTTP requests to dead idle peers
+       - Do not unconditionally revive dead peers after a DNS refresh
+       - Make PID file check/creation atomic to avoid associated race conditions
+       - Count failures and use peer-specific connect timeouts when tunneling
+       - SSL-Bump: Fix crashes when server-first bumping mode is used with openSSL-1.1.0
+       - eCAP: Fix empty header handling in Ecap::HeaderRep::hasAny()
+       - SSL-Bump: Second adaptation missing for CONNECTs
+       - ext_session_acl: cope with new logformat inputs
+       - ... and some documentation updates
+       - ... and some code stability fixes
+       - ... and all fixes from 3.5.25
+
 Changes to squid-4.0.19 (02 Apr 2017):
 
        - Bug 4674: delay_parameters for class 3 and 4 assertion failed
@@ -285,6 +305,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.26 (01 Jun 2017):
+
+       - Bug 4711: SubjectAlternativeNames is missing in some generated certificates
+       - Bug 4695: squidpurge: GCC 7 build errors
+       - Bug 4682: ignoring http_access deny when client-first bumping mode is used
+       - Bug 4682: Fix ssl_bump "bump" action documentation
+       - Bug 4653: %st lies about tunneled traffic volumes
+       - Bug 4589: ssl_crtd: returning zero on failure
+       - Bug 3772: message from FTP server gets mangled
+       - Bug 3102: FTP directory listing drops fist character of file names
+       - Add OpenSSL library details to -v output
+       - ... and some documentatino updates
+
 Changes to squid-3.5.25 (02 Apr 2017):
 
        - Bug 4688: various typo error(s) in man page(s)

diff --git a/configure.ac b/configure.ac
index 1856d30a4cb5bda88ab0e5bf22749a3eaa34ad03..c0848fab30a8d55f324e701b68ef988d0dfce1ec 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@
 ## Please see the COPYING and CONTRIBUTORS files for details.
 ##
 
-AC_INIT([Squid Web Proxy],[4.0.19-BZR],[http://bugs.squid-cache.org/],[squid])
+AC_INIT([Squid Web Proxy],[4.0.20-BZR],[http://bugs.squid-cache.org/],[squid])
 AC_PREREQ(2.61)
 AC_CONFIG_HEADERS([include/autoconf.h])
 AC_CONFIG_AUX_DIR(cfgaux)

diff --git a/doc/release-notes/release-3.5.sgml b/doc/release-notes/release-3.5.sgml
index 087d16266076fc0e7925f4a77cf040269a4e0a2c..e69d3ed1f1efd4c4e00f06bf3c667451e692dd46 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.25 release notes</title>
+<title>Squid 3.5.26 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.25.
+The Squid Team are pleased to announce the release of Squid-3.5.26.
 
 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 c54e324d183aa26ec6dc5ed2bd6f48239c25439f..a97b1d88e698e4d279a141f1297f3f064ce218b6 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.19 release notes</title>
+<title>Squid 4.0.20 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.19 for testing.
+<p>The Squid Team are pleased to announce the release of Squid-4.0.20 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">.
@@ -258,6 +258,8 @@ This section gives a thorough account of those changes in three categories:
        <p>New <em>connections_encrypted</em> type for matching transactions
           where all HTTP messages were received over TLS transport connections,
           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.
 
        <tag>auth_param</tag>
        <p>New parameter <em>queue-size=</em> to set the maximum number