Prep for 3.1.4

diff --git a/ChangeLog b/ChangeLog
index cd5c684cb885d87ca019358edf73ee327b8c170b..4bb4ae5d3b532ad6f697c1c710655ac22e3b66ed 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+Changes to squid-3.1.4 (30 May 2010):
+
+       - Bug 2933: Verification of the max. port number for WCCP2 dynamic service
+       - Bug 2924: RADIUS helper compile issues
+       - Bug 2922: Fix assertion failed: HttpHeader.cc: "Headers[id].stat.aliveCount"
+       - Bug 2919: tcp_outgoing_address ACLs not obeying acl_uses_indirect_client
+       - Bug 2896: Fix assertion failed: comm.cc:2063: "!fd_table[fd].closing()"
+       - Bug 2879: pt2: 3.0 regression in headers end finding
+       - Bug 2877: pt2: only output zero-size warning on reverse-proxy requests
+       - Bug 2876: FD_SETSIZE override not working on all linux distributions
+       - Bug 2810: common log format generates 2 lines of syslog
+       - Bug 2789: Optimize unlimited memory pools, and correctly handle limits over 2GB
+       - Bug 2753: Fall back on IPv4 if IPv6 is not present
+       - Bug 2697: Adaptation leaks and extra requests after reconfiguration
+       - Bug 2633: Fix Ecap::HeaderRep::value(name) fails when there is no named header field
+       - Change LDAP helpers to default to LDAP version 3 if available
+       - Add Joomla and Salted Hash support to squid_db_auth helper
+       - Fixed IpAddress port printing for ports higher than 9999
+       - Disable chunked memory pooling by default.
+       - ... and several build errors.
+
 Changes to squid-3.1.3 (02 May 2010):
 
        - Remove: Advertise 1.1 on replies

diff --git a/doc/release-notes/release-3.1.sgml b/doc/release-notes/release-3.1.sgml
index 8683c354a53c3ef5bc108362bb1cdb27fe787677..54542b611b154e64e21c60e9eedeffca9fa50f13 100644 (file)
--- a/doc/release-notes/release-3.1.sgml
+++ b/doc/release-notes/release-3.1.sgml
@@ -1,6 +1,6 @@
 <!doctype linuxdoc system>
 <article>
-<title>Squid 3.1.3 release notes</title>
+<title>Squid 3.1.4 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.1.3.
+The Squid Team are pleased to announce the release of Squid-3.1.4.
 
 This new release is available for download from <url url="http://www.squid-cache.org/Versions/v3/3.1/"> or the <url url="http://www.squid-cache.org/Mirrors/http-mirrors.html" name="mirrors">.
 
@@ -1244,6 +1244,11 @@ NOCOMMENT_START
        <tag>maximum_object_size_in_memory</tag>
        <p>Default size limit increased to 512KB.
 
+       <tag>memory_pools_limit</tag>
+       <p>Memory limits have been revised and corrected from 3.1.4 onwards.
+       <p>Please check and update your squid.conf to use the text <em>none</em> for no limit instead of the old 0 (zero).
+       <p>All users upgrading need to be aware that from Squid-3.3 setting this option to 0 (zero) will mean zero bytes of memory get pooled.
+
        <tag>negative_ttl</tag>
        <p>New default of 0 seconds. To prevent negative-caching of failure messages unless explicitly
           permitted by the message generating web server.
@@ -1457,7 +1462,7 @@ This section gives an account of those changes in three categories:
        <p>Removed. CARP is required by several peering algoithms. Disabling is not useful.
 
        <tag>--disable-mempools</tag>
-       <p>Removed. Can be set via squid.conf.
+       <p>Replaced by memory_pools squid.conf option.
 </descrip>
 
 

diff --git a/doc/release-notes/release-3.2.sgml b/doc/release-notes/release-3.2.sgml
index 2cc0556f575ff5fb84ef60a1d2ade13dfffb832a..78b571c71ae0013beb95f564dd3a054354a96ba0 100644 (file)
--- a/doc/release-notes/release-3.2.sgml
+++ b/doc/release-notes/release-3.2.sgml
@@ -227,6 +227,11 @@ This section gives a thorough account of those changes in three categories:
        <p><em>%>eui</em> EUI logging (EUI-48 / MAC address for IPv4, EUI-64 for IPv6)
           Both EUI forms are logged in the same field. Type can be identified by length or byte delimiter.
 
+       <tag>memory_pools_limit</tag>
+       <p>Memory limits have been revised and corrected from 3.1.4 onwards.
+       <p>Please check and update your squid.conf to use the text <em>none</em> for no limit instead of the old 0 (zero).
+       <p>All users upgrading need to be aware that from Squid-3.3 setting this option to 0 (zero) will mean zero bytes of memory get pooled.
+
        <tag>windows_ipaddrchangemonitor</tag>
        <p>Now only available to be set in Windows builds.