Prep for 3.2.1

diff --git a/ChangeLog b/ChangeLog
index 7e89a1642ac7081ae36d923eb2c37223ac9a7b24..62aa30cd87da40dc0b1aa6eef927054263f553d7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Changes to squid-3.2.1 (15 Aug 2012):
+
+       - Bug 3605: memory leak in peer selection
+       - Bug 3478: better default handling without -DSTRICT_ORIGINAL_DST
+       - ... and some documentation updates
+
 Changes to squid-3.2.0.19 (02 Aug 2012):
 
        - Regression Bug 3580: IDENT request makes squid crash

diff --git a/doc/release-notes/release-3.2.sgml b/doc/release-notes/release-3.2.sgml
index 60a78d385c9cb16b1ab559a7e0cca74d8d575abb..90e9e8d61ee2d077ef0b708a5ec6c6db83ec14a3 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.20 release notes</title>
+<title>Squid 3.2.1 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.20 for testing.
+The Squid Team are pleased to announce the release of Squid-3.2.1 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">.
 
@@ -30,6 +30,8 @@ Although this release is deemed good enough for use in many setups, please note
 
 <itemize>
        <item>TCP logging of access.log does not recover from broken connections well.
+       <item>SSL-Bump not re-wrapping decrypted traffic in CONNECT for peers.
+       <item>Cache Manager reports in txt/plain format even when requested directly via browser.
 </itemize>
 
 <p>Currently known issues which only depends on available developer time and may still be resolved in a future 3.2 release are:
@@ -941,9 +943,18 @@ This section gives an account of those changes in three categories:
 <sect1>Removed squid.conf options since Squid-2.6
 <p>
 <descrip>
+       <tag>acl</tag>
+       <p><em>urlgroup</em> type removed. Use <em>myportname</em> type instead.
+
        <tag>cache_dir</tag>
        <p><em>read-only</em> option replaced by <em>no-store</em>.
 
+       <tag>http_port</tag>
+       <p><em>urlgroup=</em> removed. Use <em>name=</em> feature instead.
+
+       <tag>zero_buffers</tag>
+       <p>Replaced by native support.
+
 </descrip>
 
 <sect1>Removed ./configure options since Squid-2.7
@@ -997,6 +1008,9 @@ This section gives an account of those changes in three categories:
        <tag>--disable-kqueue</tag>
        <p>Obsolete. Disabled by default.
 
+       <tag>--without-system-md5</tag>
+       <p>Obsolete. Disabled by default.
+
 </descrip>
 
 
@@ -1046,9 +1060,6 @@ This section gives an account of those changes in three categories:
        <tag>external_refresh_check</tag>
        <p>Not yet ported from 2.7
 
-       <tag>http_port</tag>
-       <p><em>urlgroup=</em> not yet ported from 2.6
-
        <tag>ignore_ims_on_miss</tag>
        <p>Not yet ported from 2.7
 
@@ -1085,18 +1096,7 @@ This section gives an account of those changes in three categories:
        <p>Not yet ported from 2.7
        
        <tag>update_headers</tag>
-       <p>Not yet ported from 2.7
-
-       <tag>zero_buffers</tag>
-       <p>Not yet ported from 2.7
+       <p>Not yet fully ported from 2.7. Memory and rock storage caches support this natively. UFS caches do not support it.
 
 </descrip>
-
-<sect1>Missing ./configure options available in Squid-2.7
-<p>
-<descrip>
-       <tag>--without-system-md5</tag>
-
-</descrip>
-
 </article>

diff --git a/src/cf.data.pre b/src/cf.data.pre
index b268f5c61a1e0041fe8dced21912440543af4216..a2e3afa039c57568536f05554512cc8d7f0728e8 100644 (file)
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -142,6 +142,11 @@ DOC_START
        Remove this line. All valid methods for HTTP are accepted by default.
 DOC_END
 
+# 2.7 Options Removed/Replaced in 3.2
+NAME: zero_buffers
+TYPE: obsolete
+DOC_NONE
+
 # 2.7 Options Removed/Replaced in 3.1
 NAME: incoming_rate
 TYPE: obsolete