From f977bfa698ab92e9474c775cef0e01fb756a4b0f Mon Sep 17 00:00:00 2001
From: Amos Jeffries <amosjeffries@squid-cache.org>
Date: Sun, 5 May 2019 04:05:41 +1200
Subject: [PATCH] Prep for 4.7

---
 ChangeLog                        | 11 +++++++++++
 doc/release-notes/release-4.sgml |  7 +++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 95d4cd0bfb..df91b0b4e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Changes to squid-4.7 (06 May 2019):
+
+	- Bug 4942: --with-filedescriptors does not do anything
+	- Bug 4928: Cannot convert non-IPv4 to IPv4
+	- Bug 4823: assertion failed: "lowestOffset () <= target_offset"
+	- Bug 4796: comm.cc !isOpen(conn->fd) assertion when rotating logs
+	- Fix squidclient authentication to origin servers
+	- Fix stack-based buffer-overflow when parsing SNMP messages
+	- Add support for buffer-size= to UDP logging
+	- TLS: When using OpenSSL, trust intermediate CAs from trusted store
+
 Changes to squid-4.6 (19 Feb 2019):
 
 	- Bug 4915: Detect IPv6 loopback binding errors
diff --git a/doc/release-notes/release-4.sgml b/doc/release-notes/release-4.sgml
index 89f039c141..ec1a464ab7 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.6 release notes</title>
+<title>Squid 4.7 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.6 for testing.
+<p>The Squid Team are pleased to announce the release of Squid-4.7 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">.
@@ -280,6 +280,9 @@ This section gives a thorough account of those changes in three categories:
 	<p>New option <em>rotate=</em> to control the number of log file rotations
 	   to make when <em>-k rotate</em> command is received. Default is to
 	   obey the <em>logfile_rotate</em> directive.
+	<p>Extend <em>buffer-size=</em> support to UDP logging. Prior to Squid-4.7
+	   log entries would be buffered up to 1400 bytes before sending to UDP logger.
+	   This option may now set smaller buffers, but not larger than 1400 bytes.
 
 	<tag>acl</tag>
 	<p>New <em>-m</em> flag for <em>note</em> ACL to match substrings.
-- 
2.47.2