Prep for 3.1.0.14

diff --git a/ChangeLog b/ChangeLog
index 8b4c5121b24a85335f1dec63eaf95a893b8aa1fa..bc7fb03f76ca8e95b7c75c4b6e550b489597e922 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+Changes to squid-3.1.0.14 (27 Sep 2009):
+
+       - Bug 2777: Various build issues on OpenSolaris
+       - Bug 2773: Segfault in RFC2069 Digest authentication
+       - Bug 2747: Compile errors on Solaris 10
+       - Bug 2735: Incomplete -fhuge-objects detection
+       - Bug 2722: Fix http_port accel combined with CONNECT
+       - Bug 2718: FTP sends EPSV2 on IPv4 connection
+       - Bug 2648: stateful helpers stuck in reserved
+       - Bug 2570: wccp2 "Here I Am" announcements not sent in memory-ony mode
+       - Bug 2510: digest_ldap_auth uses incorrect logic with TLS
+       - Bug 2483: bind() called before connect()
+       - Bug 2215: config file line length limit (extended to 2 KB)
+       - Support Accept-Language: * wildcard
+       - Support autoconf 2.64
+       - Support TPROXY for IPv6 traffic (requires kernel support)
+       - Support TPROXY cache cluster behind WCCPv2
+       - Correct ESI support to work in multi-mode Squid
+       - Add 0.0.0.0 as an to_localhost address
+       - DiskIO detection fixes and use optimal IO in default build.
+       - Correct peer connect-fail-limit default of 10
+       - Prevent squidclient sending two Accept: headers
+       - ... all bug fixes from 3.0.STABLE19
+       - ... and many more documentation fixes
+
 Changes to squid-3.1.0.13 (04 Aug 2009):
 
        - Bug 2723 regression: enable PURGE requests if PURGE method ACL is present.

diff --git a/doc/release-notes/release-3.1.sgml b/doc/release-notes/release-3.1.sgml
index a7d74a792916f850eb0fc2ed69b00a2ee3518da8..0d480f8bb16ef015c749f11c20e21fe2d3acca70 100644 (file)
--- a/doc/release-notes/release-3.1.sgml
+++ b/doc/release-notes/release-3.1.sgml
@@ -1113,7 +1113,7 @@ NOCOMMENT_START
        <tag>cache_mem</tag>
        <p>Default size increased to 256MB.
 
-       <tag>cache_peer htcp-no-clr htcp-no-purge-clr htcp-only-clr htcp-forward-clr connection-auth[=on|off|auto] connect-fail-limit=N</tag>
+       <tag>cache_peer htcp-no-clr htcp-no-purge-clr htcp-only-clr htcp-forward-clr connection-auth[=on|off|auto] connect-fail-limit=N no-tproxy</tag>
        <p>New Options.
        <verb>
        use 'htcp-no-clr' to send HTCP to the neighbor but without
@@ -1139,6 +1139,10 @@ NOCOMMENT_START
        use 'connect-fail-limit=nn' to specify how many times
        connecting to a peer must fail before it is marked as
        down. Default is 10.
+
+       use 'no-tproxy' to specify that requests passed to this peer
+       are not to have the client IP spoofed. For use to prevent
+       packet routing issues with a cluster of peers behind WCCPv2.
        </verb>
 
        <tag>cache_store_log</tag>