Version 2.0release-2.0

3 files changed, 15 insertions, 6 deletions

diff --git a/NEWS b/NEWS
index f5bcc13..b87dafa 100644
--- a/NEWS
+++ b/NEWS
@@ -1,11 +1,11 @@
-vmod-tbf -- history of user-visible changes. 2014-10-31
+vmod-tbf -- history of user-visible changes. 2014-11-13
 Copyright (C) 2013-2014 Sergey Poznyakoff
 See the end of file for copying conditions.
 
 Please send vmod-tbf bug reports to <gray@gnu.org>
 
 
-Version 1.0.90 (git)
+Version 2.0, 2014-11-13
 
 Support for VCL 4.0
 
diff --git a/configure.ac b/configure.ac
index 12790b6..f8e19de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with vmod-tbf.  If not, see <http://www.gnu.org/licenses/>.
 AC_PREREQ(2.69)
-AC_INIT([vmod-tbf], 1.0.90, [gray@gnu.org])
+AC_INIT([vmod-tbf], 2.0, [gray@gnu.org])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR(src/vmod_tbf.vcc)
diff --git a/src/vmod-tbf.3 b/src/vmod-tbf.3
index 6ab2f63..03d7daf 100644
--- a/src/vmod-tbf.3
+++ b/src/vmod-tbf.3
@@ -13,7 +13,7 @@
 .\"
 .\" You should have received a copy of the GNU General Public License
 .\" along with vmod-tbf.  If not, see <http://www.gnu.org/licenses/>.
-.TH VMOD-TBF 1 "November 1, 2014" "VMOD-TBF" "User Reference"
+.TH VMOD-TBF 1 "November 13, 2014" "VMOD-TBF" "User Reference"
 .SH NAME
 vmod-tbf \- token bucket filtering for Varnish
 .SH SYNOPSIS
@@ -78,7 +78,7 @@ The function returns \fBTRUE\fR if the data are accepted and
 .EX
 sub vcl_recv {
     if (!tbf.rate("ip:" + client.ip, 1, 0.1s, 20)) {
-        error 429 "Request rate exceeded."
+        error(429, "Request rate exceeded");
     }
 }
 .EE 
@@ -87,6 +87,15 @@ This example will keep the incoming requests at the rate of 10 requests
 per second, allowing for bursts of up to 20 requests after each 2
 second (or longer) period of inactivity.
 .PP
+For VCL 4.0, replace
+.EX
+        error(429, "Request rate exceeded");
+.EE
+with
+.EX
+        return(synth(429, "Request rate exceeded"));
+.EE
+.PP
 The \fBtbf.check\fR function provides a higher-level interface.  Its
 first argument identifies the bucket.  The \fIrate\fR argument is a
 textual rate specification in the form:
@@ -104,7 +113,7 @@ ten and a half requests per second:
 .EX
 sub vcl_recv {
     if (!tbf.check(client.ip, "10.5 req/1s")) {
-        error 429 "Request rate exceeded."
+        error(429, "Request rate exceeded");
     }
 }
 .EE