Prep for 3.2.0.12

diff --git a/ChangeLog b/ChangeLog
index bf8711d99a5b0306388401121ef130d6be20236f..bc686e3680bee7d91608ea5ff2bd7419cc98ad0d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+Changes to squid-3.2.0.12 (17 Sep 2011):
+
+       - Regression Bug 3335: ICAP service is down
+       - Regression Bug 3322: adapt:: and icap:: format codes do not parse
+       - Regression Bug 3303: Support for non-English usernames in log files
+       - Regression Bug 3259: assertion failed: Connection.cc:29: 'fd<0' after REVIVED PARENT
+       - Regression: %I shows hostname on SSL error page
+       - Regression: FTP outgoing port always 'in use' on PASV connections
+       - Bug 3337: (partial) status 200 is not accepted for deny_info
+       - Bug 3319: Inconsistencies in error messages
+       - Bug 3281: pconn in-use while closing assertion
+       - Bug 3243: Fix cases: raw-IPv6, case variant FQDN, internal request
+       - Fixed max-stale check. Entities not exceeding max-stale were marked as stale
+       - Adjust format code %la for intercepted connections
+       - Log ICAP_ERR_GONE ICAP transaction outcome when ICAP initiator disappears early
+       - Send RST packet when closing an ICAP connection after a transaction error
+       - Support maximum field width for string access.log fields
+
 Changes to squid-3.2.0.11 (28 Aug 2011):
 
        - Bug 3243: CVE-2009-0801 Bypass of browser same-origin access control

diff --git a/doc/release-notes/release-3.2.sgml b/doc/release-notes/release-3.2.sgml
index 7d2becb58d196df89fbcabdfacf3767d28eabdd3..50f8092e694e504c4a54915515d1f50880ff917e 100644 (file)
--- a/doc/release-notes/release-3.2.sgml
+++ b/doc/release-notes/release-3.2.sgml
@@ -1,6 +1,6 @@
 <!doctype linuxdoc system>
 <article>
-<title>Squid 3.2.0.11 release notes</title>
+<title>Squid 3.2.0.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.2.0.11 for testing.
+The Squid Team are pleased to announce the release of Squid-3.2.0.12 for testing.
 
 This new release is available for download from <url url="http://www.squid-cache.org/Versions/v3/3.2/"> or the <url url="http://www.squid-cache.org/Mirrors/http-mirrors.html" name="mirrors">.