From: Amos Jeffries
Date: Sat, 3 Dec 2011 06:18:25 +0000 (-0700)
Subject: 3.1.18
X-Git-Tag: SQUID_3_1_18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a214cc234b1f283cec7dbae50ea063c9f94c68d7;p=thirdparty%2Fsquid.git
3.1.18
---
diff --git a/ChangeLog b/ChangeLog
index 3d2715c981..65bfb63a38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Changes to squid-3.1.18 (03 Dec 2011):
+
+ - Regression: compile error in FTP
+
Changes to squid-3.1.17 (03 Dec 2011):
- Bug 3432: Crash logging FTP errors
diff --git a/configure.ac b/configure.ac
index 3f05984536..f1e7190e55 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
dnl
dnl $Id$
dnl
-AC_INIT([Squid Web Proxy],[3.1.17-BZR],[http://www.squid-cache.org/bugs/],[squid])
+AC_INIT([Squid Web Proxy],[3.1.18-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 3c622c6bbd..b95659583e 100644
--- a/doc/release-notes/release-3.1.html
+++ b/doc/release-notes/release-3.1.html
@@ -2,10 +2,10 @@
- Squid 3.1.17 release notes
+ Squid 3.1.18 release notes
-Squid 3.1.17 release notes
+Squid 3.1.18 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.17
+The Squid Team are pleased to announce the release of Squid-3.1.18
This new release is available for download from
http://www.squid-cache.org/Versions/v3/3.1/ or the
mirrors.
@@ -1302,7 +1302,7 @@ format, so all helpers will need to be checked and converted to cope with such i
%<{Hdr:;member} HTTP reply header list member using ; as
list separator. ; can be any non-alphanumeric
character.
- %% The percent symbol
+ %% The percent symbol (available from 3.1.17)
diff --git a/doc/release-notes/release-3.1.sgml b/doc/release-notes/release-3.1.sgml
index 152f61439b..be424cfe57 100644
--- a/doc/release-notes/release-3.1.sgml
+++ b/doc/release-notes/release-3.1.sgml
@@ -1,6 +1,6 @@
-Squid 3.1.17 release notes
+Squid 3.1.18 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.17
+The Squid Team are pleased to announce the release of Squid-3.1.18
This new release is available for download from or the .
@@ -1129,7 +1129,7 @@ NOCOMMENT_START
%<{Hdr:;member} HTTP reply header list member using ; as
list separator. ; can be any non-alphanumeric
character.
- %% The percent symbol
+ %% The percent symbol (available from 3.1.17)
forwarded_for