From: Amos Jeffries <yadij@users.noreply.github.com>
Date: Fri, 1 Oct 2021 23:33:19 +0000 (+0000)
Subject: Prep for 4.17 and 5.2 (#905)
X-Git-Tag: SQUID_6_0_1~285
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04add666dda3315cff093b49b58508a75112906c;p=thirdparty%2Fsquid.git

Prep for 4.17 and 5.2 (#905)
---

diff --git a/ChangeLog b/ChangeLog
index 555876188c..1b16b02b96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Changes in squid-5.2 (03 Oct 2021):
+
+	- Bug 5164: a copy-paste typo in HttpHdrCc::hasMinFresh()
+	- Bug 4922: Improve ftp://... filename extraction
+	- TLS: Fix X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY handling
+	- ... and all fixes from 4.17
+
 Changes in squid-5.1 (01 Aug 2021):
 
 	- Bug 4696: Fix leaky String move assignment operator
@@ -120,6 +127,10 @@ Changes in squid-5.0.1 (14 Jan 2020):
 	- ... and much code cleanup and polishing
 	- ... and all fixes from 4.10
 
+Changes in squid-4.17 (03 Oct 2021):
+
+	- WCCP: Validate packets better
+
 Changes in squid-4.16 (04 Jul 2021):
 
 	- Regression Fix: --with-valgrind-debug build broken since 4.15
diff --git a/doc/release-notes/release-4.sgml b/doc/release-notes/release-4.sgml
index 0130a695ba..74018725b4 100644
--- 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.16 release notes</title>
+<title>Squid 4.17 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.16.
+<p>The Squid Team are pleased to announce the release of Squid-4.17.
 
 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">.
diff --git a/doc/release-notes/release-5.sgml b/doc/release-notes/release-5.sgml
index 1b5086e032..56cba97c1b 100644
--- a/doc/release-notes/release-5.sgml
+++ b/doc/release-notes/release-5.sgml
@@ -1,6 +1,6 @@
 <!doctype linuxdoc system>
 <article>
-<title>Squid 5.1 release notes</title>
+<title>Squid 5.2 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-5.1.
+<p>The Squid Team are pleased to announce the release of Squid-5.2.
 
 This new release is available for download from <url url="http://www.squid-cache.org/Versions/v5/"> or the
  <url url="http://www.squid-cache.org/Download/http-mirrors.html" name="mirrors">.