From: Amos Jeffries <yadij@users.noreply.github.com>
Date: Sat, 29 Dec 2018 22:20:34 +0000 (+1300)
Subject: Prep for 4.5 (#343)
X-Git-Tag: M-staged-PR347~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6f405e998d29f4c13d012f02352a37d4633eda6a;p=thirdparty%2Fsquid.git

Prep for 4.5 (#343)
---

diff --git a/ChangeLog b/ChangeLog
index d3e7fc0c29..3acd97eb12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,16 @@
-Changes to squid-4.3 (28 Oct 2018):
+Changes to squid-4.5 (01 Jan 2019):
+
+	- Bug 4253: ssl_bump prevents access to some web contents
+	- TLS: add %>handshake logformat code
+	- Redesign forward_max_tries to count TCP connection attempts
+	- Fix client_connection_mark ACL handling of clientless transactions
+	- Fix netdb exchange with a TLS cache_peer
+	- Update netdb when tunneling requests
+	- Use pkg-config for detecting libxml2
+	- ... and some documentation updates
+	- ... and some code compile fixes
+
+Changes to squid-4.4 (28 Oct 2018):
 
 	- Bug 4893: Malformed %>ru URIs for CONNECT requests
 	- Fix %USER_CA_CERT_xx and %USER_CERT_xx crashes
diff --git a/doc/release-notes/release-4.sgml b/doc/release-notes/release-4.sgml
index b97d5c425d..aab2d7f068 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.4 release notes</title>
+<title>Squid 4.5 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.4 for testing.
+<p>The Squid Team are pleased to announce the release of Squid-4.5 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">.
@@ -283,8 +283,8 @@ This section gives a thorough account of those changes in three categories:
 
 	<tag>acl</tag>
 	<p>New <em>-m</em> flag for <em>note</em> ACL to match substrings.
-	<p>New <em>clientside_mark</em> type for matching Netfilter CONNMARK on
-	   the client TCP connection.
+	<p>New <em>client_connection_mark</em> type for matching Netfilter
+	   CONNMARK of the client TCP connection.
 	<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.
@@ -413,6 +413,8 @@ This section gives a thorough account of those changes in three categories:
 	   negotiated cipher of the client connection.
 	<p>New code <em>%ssl::&lt;negotiated_cipher</em> to display the
 	   negotiated cipher of the last server or peer connection.
+	<p>New code <em>%&gt;handshake</em> to display initial octets
+	   received on a client connection (Base64 encoded).
 	<p>Fixed <em>%&lt;Hs</em>, <em>%&lt;pt</em> and <em>%&lt;tt</em>
 	   codes for received CONNECT errors.
 	<p>Improved <em>%&lt;bs</em> logging on forwarding retries.