Prep for 4.0.3 and 3.5.12

diff --git a/ChangeLog b/ChangeLog
index 8df8415fa5047b7c94aeedde130f1d2729b5de78..a013ffd124e3661321841035f70e7a1564d1ffdd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Changes to squid-4.0.3 (28 Nov 2015):
+
+       - Bug 4372: missing template files
+       - Bug 4371: compile errors: no such file or directory: DiskIO/*/*DiskIOModule.o
+       - Bug 4368: A simpler and more robust HTTP request line parser
+       - Fix compile erorr on clang undefined reference to '__atomic_load_8'
+       - ext_kerberos_ldap_group_acl: Add missing workarounds for Heimdal Kerberos
+       - ext_ldap_group_acl: Allow unlimited LDAP search filter
+       - ext_unix_group_acl: Support -r parameter to strip @REALM from usernames
+       - ... and much code cleanup and polishing
+       - ... and all fixes from squid 3.5.11
+
 Changes to squid-4.0.2 (01 Nov 2015):
 
        - Regression Bug 4351: compile errors when authentication modules disabled
@@ -60,6 +72,18 @@ Changes to squid-4.0.1 (14 Oct 2015):
        - ... and many documentation changes
        - ... and much code cleanup and polishing
 
+Changes to squid-3.5.12 (28 Nov 2015):
+
+       - Bug 4374: refresh_pattern config parser (%)
+       - Bug 4373: assertion 'calloutContext->redirect_state == REDIRECT_NONE'
+       - Bug 4228: links with krb5 libs despite --without options
+       - Fix SSL_get_certificate() problem detection
+       - Fix TLS handshake problem during Renegotiation
+       - Fix cache_peer forceddomain= in CONNECT
+       - Fix status code-based HTTP reason phrase for eCAP-generated messages
+       - Fix build errors in cpuafinity.cc
+       - ... and several documentation updates
+
 Changes to squid-3.5.11 (01 Nov 2015):
 
        - Bug 3574: crashes on reconfigure and startup

diff --git a/doc/release-notes/release-3.5.sgml b/doc/release-notes/release-3.5.sgml
index e261072504acc2610b2b67a55e157ff114184764..70dd948011b448bb29275988016ce1dd0967beba 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.11 release notes</title>
+<title>Squid 3.5.12 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.11.
+The Squid Team are pleased to announce the release of Squid-3.5.12.
 
 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 75509f4c28cc1cb83a7611a423401b9f33a2bcc6..bc110007da2ccde89ecf4b7a653386c7503c0efb 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.2 release notes</title>
+<title>Squid 4.0.3 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.2 for testing.
+<p>The Squid Team are pleased to announce the release of Squid-4.0.3 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">.