diff options
-rw-r--r-- | NEWS | 6 | ||||
m--------- | acvmod | 0 | ||||
-rw-r--r-- | configure.ac | 5 | ||||
-rw-r--r-- | tests/Makefile.am | 1 | ||||
-rw-r--r-- | tests/atlocal.in | 2 | ||||
-rw-r--r-- | tests/check.at | 2 | ||||
-rw-r--r-- | tests/checkf.at | 2 | ||||
-rw-r--r-- | tests/dump.at | 2 | ||||
-rw-r--r-- | tests/rate.at | 2 | ||||
-rw-r--r-- | tests/ratef.at | 2 | ||||
-rw-r--r-- | tests/strftime.at | 2 |
11 files changed, 16 insertions, 10 deletions
@@ -1,8 +1,12 @@ | |||
1 | vmod-tbf -- history of user-visible changes. 2017-08-06 | 1 | vmod-tbf -- history of user-visible changes. 2017-08-10 |
2 | Copyright (C) 2013-2017 Sergey Poznyakoff | 2 | Copyright (C) 2013-2017 Sergey Poznyakoff |
3 | See the end of file for copying conditions. | 3 | See the end of file for copying conditions. |
4 | 4 | ||
5 | Please send vmod-tbf bug reports to <gray@gnu.org> | 5 | Please send vmod-tbf bug reports to <gray@gnu.org> |
6 | |||
7 | Version 2.2, 2017-08-10 | ||
8 | |||
9 | * Support for Varnish 5.1 | ||
6 | 10 | ||
7 | 11 | ||
8 | Version 2.1, 2017-08-06 | 12 | Version 2.1, 2017-08-06 |
diff --git a/acvmod b/acvmod | |||
Subproject ba32780019480b89cd9d796b93a76cae6afe99a | Subproject 5f6dce2f7dd35a154333bb42d134a018b981f81 | ||
diff --git a/configure.ac b/configure.ac index 04563c6..f42e2ef 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -14,12 +14,13 @@ | |||
14 | # You should have received a copy of the GNU General Public License | 14 | # You should have received a copy of the GNU General Public License |
15 | # along with vmod-tbf. If not, see <http://www.gnu.org/licenses/>. | 15 | # along with vmod-tbf. If not, see <http://www.gnu.org/licenses/>. |
16 | AC_PREREQ(2.69) | 16 | AC_PREREQ(2.69) |
17 | AC_INIT([vmod-tbf], 2.1, [gray@gnu.org]) | 17 | AC_INIT([vmod-tbf], 2.2, [gray@gnu.org]) |
18 | AC_CONFIG_AUX_DIR([build-aux]) | 18 | AC_CONFIG_AUX_DIR([build-aux]) |
19 | AC_CONFIG_MACRO_DIR([m4]) | 19 | AC_CONFIG_MACRO_DIR([m4]) |
20 | AC_CONFIG_SRCDIR(src/vmod_tbf.vcc) | 20 | AC_CONFIG_SRCDIR(src/vmod_tbf.vcc) |
21 | AM_CONFIG_HEADER(config.h) | 21 | AM_CONFIG_HEADER(config.h) |
22 | 22 | ||
23 | AC_SUBST([AC_VMOD_BASENAME],[tbf]) | ||
23 | AC_CANONICAL_SYSTEM | 24 | AC_CANONICAL_SYSTEM |
24 | AC_LANG(C) | 25 | AC_LANG(C) |
25 | 26 | ||
@@ -45,7 +46,7 @@ AC_CHECK_HEADERS(sys/sysinfo.h) | |||
45 | # Check for functions | 46 | # Check for functions |
46 | AC_CHECK_FUNCS(sysinfo getloadavg) | 47 | AC_CHECK_FUNCS(sysinfo getloadavg) |
47 | 48 | ||
48 | AM_VARNISHAPI | 49 | AM_VARNISHAPI([4.1],[5.1]) |
49 | 50 | ||
50 | AC_CONFIG_TESTDIR(tests) | 51 | AC_CONFIG_TESTDIR(tests) |
51 | AC_CONFIG_FILES([tests/Makefile tests/atlocal]) | 52 | AC_CONFIG_FILES([tests/Makefile tests/atlocal]) |
diff --git a/tests/Makefile.am b/tests/Makefile.am index 30b0360..23fa477 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am | |||
@@ -31,6 +31,7 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac | |||
31 | echo 'm4_define([AT_PACKAGE_VERSION], [@PACKAGE_VERSION@])'; \ | 31 | echo 'm4_define([AT_PACKAGE_VERSION], [@PACKAGE_VERSION@])'; \ |
32 | echo 'm4_define([AT_PACKAGE_STRING], [@PACKAGE_STRING@])'; \ | 32 | echo 'm4_define([AT_PACKAGE_STRING], [@PACKAGE_STRING@])'; \ |
33 | echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \ | 33 | echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \ |
34 | echo 'm4_define([AT_VMOD_BASENAME], [@AC_VMOD_BASENAME@])'; \ | ||
34 | } >$(srcdir)/package.m4 | 35 | } >$(srcdir)/package.m4 |
35 | 36 | ||
36 | # | 37 | # |
diff --git a/tests/atlocal.in b/tests/atlocal.in index 9f80ebf..f901648 100644 --- a/tests/atlocal.in +++ b/tests/atlocal.in | |||
@@ -2,6 +2,6 @@ | |||
2 | # Configurable variable values for vmod_tbf test suite. | 2 | # Configurable variable values for vmod_tbf test suite. |
3 | # Copyright (C) 2017 Sergey Poznyakoff | 3 | # Copyright (C) 2017 Sergey Poznyakoff |
4 | 4 | ||
5 | PATH=@abs_builddir@:@abs_top_builddir@/src:@abs_top_srcdir@/build-aux:$top_srcdir:$srcdir:$PATH | 5 | PATH=@abs_builddir@:@abs_top_builddir@/src:@abs_top_srcdir@/build-aux:$top_srcdir:$srcdir:@VARNISH_SBINDIR@:$PATH |
6 | VARNISHTEST=@VARNISHTEST@ | 6 | VARNISHTEST=@VARNISHTEST@ |
7 | VARNISHD=@VARNISHD@ | 7 | VARNISHD=@VARNISHD@ |
diff --git a/tests/check.at b/tests/check.at index f45c1b1..9ed2974 100644 --- a/tests/check.at +++ b/tests/check.at | |||
@@ -15,7 +15,7 @@ | |||
15 | # along with vmod-tbf. If not, see <http://www.gnu.org/licenses/>. | 15 | # along with vmod-tbf. If not, see <http://www.gnu.org/licenses/>. |
16 | AT_SETUP([check]) | 16 | AT_SETUP([check]) |
17 | AT_KEYWORDS([check]) | 17 | AT_KEYWORDS([check]) |
18 | AT_VARNISHTEST([tbf],[ | 18 | AT_VARNISHTEST([ |
19 | sub vcl_recv { | 19 | sub vcl_recv { |
20 | if (!tbf.check("url:"+req.url, "4 req/s")) { | 20 | if (!tbf.check("url:"+req.url, "4 req/s")) { |
21 | return (synth(420, "Overlimit")); | 21 | return (synth(420, "Overlimit")); |
diff --git a/tests/checkf.at b/tests/checkf.at index c4155ba..f85c4a4 100644 --- a/tests/checkf.at +++ b/tests/checkf.at | |||
@@ -15,7 +15,7 @@ | |||
15 | # along with vmod-tbf. If not, see <http://www.gnu.org/licenses/>. | 15 | # along with vmod-tbf. If not, see <http://www.gnu.org/licenses/>. |
16 | AT_SETUP([check flow]) | 16 | AT_SETUP([check flow]) |
17 | AT_KEYWORDS([checkf flow]) | 17 | AT_KEYWORDS([checkf flow]) |
18 | AT_VARNISHTEST([tbf],[ | 18 | AT_VARNISHTEST([ |
19 | sub vcl_deliver { | 19 | sub vcl_deliver { |
20 | set resp.http.result = tbf.check("url:"+req.url, "4req/s"); | 20 | set resp.http.result = tbf.check("url:"+req.url, "4req/s"); |
21 | } | 21 | } |
diff --git a/tests/dump.at b/tests/dump.at index b4230de..6602697 100644 --- a/tests/dump.at +++ b/tests/dump.at | |||
@@ -16,7 +16,7 @@ | |||
16 | 16 | ||
17 | AT_SETUP([dump/load facilities]) | 17 | AT_SETUP([dump/load facilities]) |
18 | AT_KEYWORDS([dump load]) | 18 | AT_KEYWORDS([dump load]) |
19 | AT_VARNISHTEST([tbf],[ | 19 | AT_VARNISHTEST([ |
20 | # sub vcl_init { | 20 | # sub vcl_init { |
21 | # tbf.debug(20); | 21 | # tbf.debug(20); |
22 | # } | 22 | # } |
diff --git a/tests/rate.at b/tests/rate.at index 75d9df4..e13473d 100644 --- a/tests/rate.at +++ b/tests/rate.at | |||
@@ -16,7 +16,7 @@ | |||
16 | 16 | ||
17 | AT_SETUP([rate]) | 17 | AT_SETUP([rate]) |
18 | AT_KEYWORDS([rate]) | 18 | AT_KEYWORDS([rate]) |
19 | AT_VARNISHTEST([tbf],[ | 19 | AT_VARNISHTEST([ |
20 | sub vcl_recv { | 20 | sub vcl_recv { |
21 | if (!tbf.rate("url:"+req.url, 1, 20 s, 5)) { | 21 | if (!tbf.rate("url:"+req.url, 1, 20 s, 5)) { |
22 | return (synth(420, "Overlimit")); | 22 | return (synth(420, "Overlimit")); |
diff --git a/tests/ratef.at b/tests/ratef.at index d0dc7ea..40a86e6 100644 --- a/tests/ratef.at +++ b/tests/ratef.at | |||
@@ -16,7 +16,7 @@ | |||
16 | 16 | ||
17 | AT_SETUP([rate flow]) | 17 | AT_SETUP([rate flow]) |
18 | AT_KEYWORDS([ratef flow]) | 18 | AT_KEYWORDS([ratef flow]) |
19 | AT_VARNISHTEST([tbf],[ | 19 | AT_VARNISHTEST([ |
20 | sub vcl_deliver { | 20 | sub vcl_deliver { |
21 | set resp.http.result = tbf.rate("url:"+req.url, 1, 1s, 5); | 21 | set resp.http.result = tbf.rate("url:"+req.url, 1, 1s, 5); |
22 | } | 22 | } |
diff --git a/tests/strftime.at b/tests/strftime.at index 58fc723..55b04fd 100644 --- a/tests/strftime.at +++ b/tests/strftime.at | |||
@@ -16,7 +16,7 @@ | |||
16 | 16 | ||
17 | AT_SETUP([strftime]) | 17 | AT_SETUP([strftime]) |
18 | AT_KEYWORDS([strftime]) | 18 | AT_KEYWORDS([strftime]) |
19 | AT_VARNISHTEST([tbf],[ | 19 | AT_VARNISHTEST([ |
20 | sub vcl_deliver { | 20 | sub vcl_deliver { |
21 | set resp.http.result = tbf.strftime("%Y-%m-%d", 26697600); | 21 | set resp.http.result = tbf.strftime("%Y-%m-%d", 26697600); |
22 | } | 22 | } |