From b62df37fee2ce5ef9f76eda9a07b86483e9ed3f8 Mon Sep 17 00:00:00 2001
From: Amos Jeffries <yadij@users.noreply.github.com>
Date: Fri, 11 Feb 2022 13:08:27 +0000
Subject: [PATCH] Prep for 5.4.1 (#978)

---
 ChangeLog                        | 23 +++++++++++++++++++++++
 doc/release-notes/release-5.sgml |  4 ++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 978047e962..8b03647422 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+Changes in squid-5.4.1 (12 Feb 2021):
+
+	- Bug 5055: FATAL FwdState::noteDestinationsEnd exception: opening
+	- Fix FATAL ServiceRep::putConnection exception: theBusyConns > 0
+	- Fix ConnOpener orphan connection warnings when requester ends early
+	- Fix ConnOpener connection handling when sending negative answers
+	- Fix Comm::ConnOpener::cleanFd() debugging
+	- Fix ConnOpener callback's syncWithComm()
+	- Fix FwdState::advanceDestination() losing ERR_GATEWAY_FAILURE details
+	- Fix Tunneler handling of last-resort callback on premature job ending
+	- Fix PeerConnector handling of last-resort callback on premature job ending
+	- Fix FreeBSD 14 build
+	- Fix OpenBSD 7.0 build
+	- Add Comm::Connection::cloneDestinationDetails() debugging
+	- Improve Security::PeerConnector::serverConn and Http::Tunneler::connection management
+	- Refactor ConnOpener users to stop relying on the answer providing Comm::Connection
+	- Refactor ICAP connection-establishing code
+	- Polish PeerPoolMgr code
+	- Polish IDENT code
+	- Polish Gopher code
+	- Polished AsyncJob::Start() API
+	- ... and update code documentation
+
 Changes in squid-5.4 (07 Feb 2021):
 
 	- Bug 5190: Preserve configured order of intermediate CA certificate chain
diff --git a/doc/release-notes/release-5.sgml b/doc/release-notes/release-5.sgml
index 80303764c4..064be0a76a 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.4 release notes</title>
+<title>Squid 5.4.1 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.4.
+<p>The Squid Team are pleased to announce the release of Squid-5.4.1.
 
 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">.
-- 
2.47.3