From ac98a7060f6e8fa803b3aedd39de3a28a0aa8b68 Mon Sep 17 00:00:00 2001
From: Amos Jeffries
Date: Fri, 8 Jun 2012 05:19:27 -0600
Subject: [PATCH] 3.1.20
---
ChangeLog | 20 ++++++++++++++++++++
configure.ac | 2 +-
doc/release-notes/release-3.1.html | 13 ++++++-------
doc/release-notes/release-3.1.sgml | 4 ++--
4 files changed, 29 insertions(+), 10 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 659c70c512..5fdfa1bbee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+Changes to squid-3.1.20 (08 Jun 2011):
+
+ - Regression Bug 3545: FreeBSD dnsserver segfaults
+ - Regression Bug 3504: clientside_tos fails to mark traffic
+ - Bug 3539: CONNECT server connection not closed correctly on errors
+ - Bug 3502: client timeout uses server-side read_timeout, not request_timeout
+ - Bug 3466: Adaptation stuck on last single-byte body piece
+ - Bug 3463: dnsserver fails to compile
+ - Bug 3439: correct external_acl_type documented default for ipv4/ipv6 option
+ - Bug 3390: Proxy auth data visible to scripts
+ - Bug 3263: ssl_crtd: undefined references to squid_curtime
+ - Bug 3233: Invalid URL accepted with url host is white spaces
+ - Bug 3133: Memory leak handling requests for sites that don't exist
+ - Bug 3074: Improper URL handling with empty path (RFC 3986)
+ - Bug 3013: segmentation fault on shutdown commSetCloseOnExec at comm.cc:1889
+ - Regression: snmp/udp address directives not resolving hostname
+ - Better helper-to-Squid buffer size management.
+ - Support CoAP over HTTP (coap:// and coaps:// URLs)
+ - Support for 3.2 error template codes
+
Changes to squid-3.1.19 (06 Feb 2011):
- Regression Bug 3441: part 2: Prevent further cache size corruption of swap.state
diff --git a/configure.ac b/configure.ac
index 52e8615110..56e9f3ef79 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
dnl
dnl $Id$
dnl
-AC_INIT([Squid Web Proxy],[3.1.19-BZR],[http://www.squid-cache.org/bugs/],[squid])
+AC_INIT([Squid Web Proxy],[3.1.20-BZR],[http://www.squid-cache.org/bugs/],[squid])
AC_PREREQ(2.61)
AC_CONFIG_HEADERS([include/autoconf.h])
AC_CONFIG_AUX_DIR(cfgaux)
diff --git a/doc/release-notes/release-3.1.html b/doc/release-notes/release-3.1.html
index 5bbce157a1..39f3957521 100644
--- a/doc/release-notes/release-3.1.html
+++ b/doc/release-notes/release-3.1.html
@@ -2,10 +2,10 @@
- Squid 3.1.19 release notes
+ Squid 3.1.20 release notes
-Squid 3.1.19 release notes
+Squid 3.1.20 release notes
Squid Developers
@@ -71,7 +71,7 @@ for Applied Network Research and members of the Web Caching community.
-The Squid Team are pleased to announce the release of Squid-3.1.19
+The Squid Team are pleased to announce the release of Squid-3.1.20
This new release is available for download from
http://www.squid-cache.org/Versions/v3/3.1/ or the
mirrors.
@@ -1280,13 +1280,12 @@ contained in the directory it points at. If absent, error page localization will
external_acl_type
New options 'ipv4' and 'ipv6' are added to set the IPv4/v6 protocol between Squid and its helpers.
-Please be aware of some limits to these options. These options only affet the transport protocol used
+Please be aware of some limits to these options. These options only affect the transport protocol used
to send data to and from the helpers. Squid in IPv6-mode may still send %SRC addresses in IPv4 or IPv6
format, so all helpers will need to be checked and converted to cope with such information cleanly.
- ipv4 / ipv6 IP-mode used to communicate to this helper.
- For compatability with older configurations and helpers
- the default is 'ipv4'.
+ ipv4 / ipv6 IP protocol used to communicate with this helper.
+ The default is to auto-detect IPv6 and use it when available.
diff --git a/doc/release-notes/release-3.1.sgml b/doc/release-notes/release-3.1.sgml
index 7b8bf2a20f..86b6fdda81 100644
--- a/doc/release-notes/release-3.1.sgml
+++ b/doc/release-notes/release-3.1.sgml
@@ -1,6 +1,6 @@
-Squid 3.1.19 release notes
+Squid 3.1.20 release notes
Squid Developers
@@ -13,7 +13,7 @@ for Applied Network Research and members of the Web Caching community.
Notice
-The Squid Team are pleased to announce the release of Squid-3.1.19
+The Squid Team are pleased to announce the release of Squid-3.1.20
This new release is available for download from or the .
--
2.47.2