summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org.ua>2017-08-10 12:28:18 (GMT)
committer Sergey Poznyakoff <gray@gnu.org.ua>2017-08-10 12:28:18 (GMT)
commitc8cee8164cf638da3851a2c56a844e5ff3609eb0 (patch) (side-by-side diff)
treec7b87a2e05d8636a7dd1105dae066269f760dcbf
parentc00608a8e43c28712d120dd874650c652729af09 (diff)
downloadvmod-variable-c8cee8164cf638da3851a2c56a844e5ff3609eb0.tar.gz
vmod-variable-c8cee8164cf638da3851a2c56a844e5ff3609eb0.tar.bz2
Support for varnish 5.1.release-1.2
* configure.ac: Set version 1.2 (AC_VMOD_BASENAME): New subst variable. * NEWS: : Document changes. * acvmod: Updated. * tests/Makefile.am: Define AT_VMOD_BASENAME in package.m4 * tests/atlocal.in: Add @VARNISH_SBINDIR@ to PATH. * tests/clear.at: Change arguments to AM_VARNISHTEST macro. * tests/complex.at: Likewise. * tests/defined.at: Likewise. * tests/duration.at: Likewise. * tests/gstring.at: Likewise. * tests/int.at: Likewise. * tests/queryset00.at: Likewise. * tests/queryset01.at: Likewise. * tests/real.at: Likewise. * tests/regset.at: Likewise. * tests/string.at: Likewise. * tests/type_of.at: Likewise. * tests/unset.at: Likewise.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--NEWS10
m---------acvmod0
-rw-r--r--configure.ac5
-rw-r--r--tests/Makefile.am1
-rw-r--r--tests/atlocal.in2
-rw-r--r--tests/clear.at2
-rw-r--r--tests/complex.at2
-rw-r--r--tests/defined.at2
-rw-r--r--tests/duration.at2
-rw-r--r--tests/gstring.at2
-rw-r--r--tests/int.at2
-rw-r--r--tests/queryset00.at2
-rw-r--r--tests/queryset01.at2
-rw-r--r--tests/real.at2
-rw-r--r--tests/regset.at2
-rw-r--r--tests/string.at2
-rw-r--r--tests/type_of.at2
-rw-r--r--tests/unset.at2
18 files changed, 25 insertions, 19 deletions
diff --git a/NEWS b/NEWS
index 338a523..f2fbb38 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,12 @@
-vmod-variable -- history of user-visible changes. 2017-08-06
-Copyright (C) 2015-2016 Sergey Poznyakoff
+vmod-variable -- history of user-visible changes. 2017-08-10
+Copyright (C) 2015-2017 Sergey Poznyakoff
See the end of file for copying conditions.
Please send vmod-variable bug reports to <gray@gnu.org>
+
+Version 1.2, 2017-08-10
+
+* Support for Varnish 5.1
Version 1.1, 2017-08-06
@@ -22,7 +26,7 @@ Initial release
=========================================================================
Copyright information:
-Copyright (C) 2015-2016 Sergey Poznyakoff
+Copyright (C) 2015-2017 Sergey Poznyakoff
Permission is granted to anyone to make or distribute verbatim copies
of this document as received, in any medium, provided that the
diff --git a/acvmod b/acvmod
-Subproject ba32780019480b89cd9d796b93a76cae6afe99a
+Subproject 5f6dce2f7dd35a154333bb42d134a018b981f81
diff --git a/configure.ac b/configure.ac
index e968280..e80461a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,12 +14,13 @@
# You should have received a copy of the GNU General Public License
# along with vmod-variable. If not, see <http://www.gnu.org/licenses/>.
AC_PREREQ(2.69)
-AC_INIT([vmod-variable], [1.1], [gray@gnu.org])
+AC_INIT([vmod-variable], [1.2], [gray@gnu.org])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR(src/variable.vcc)
AM_CONFIG_HEADER(config.h)
+AC_SUBST([AC_VMOD_BASENAME],[variable])
AC_CANONICAL_SYSTEM
AC_LANG(C)
@@ -49,7 +50,7 @@ AC_CHECK_FUNCS(sysinfo getloadavg)
AC_CHECK_LIB(pcre, pcre_compile,,
AC_MSG_ERROR([required library libpcre not found]))
-AM_VARNISHAPI([4.1])
+AM_VARNISHAPI([4.1],[5.1])
AC_CONFIG_TESTDIR(tests)
AC_CONFIG_FILES([tests/Makefile tests/atlocal])
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2d5a2d6..114533e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -31,6 +31,7 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac
echo 'm4_define([AT_PACKAGE_VERSION], [@PACKAGE_VERSION@])'; \
echo 'm4_define([AT_PACKAGE_STRING], [@PACKAGE_STRING@])'; \
echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
+ echo 'm4_define([AT_VMOD_BASENAME], [@AC_VMOD_BASENAME@])'; \
} >$(srcdir)/package.m4
#
diff --git a/tests/atlocal.in b/tests/atlocal.in
index f229f09..993dded 100644
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -2,7 +2,7 @@
# Configurable variable values for vmod-variable test suite.
# Copyright (C) 2015, 2017 Sergey Poznyakoff
-PATH=@abs_builddir@:@abs_top_builddir@/src:@abs_top_srcdir@/build-aux:$top_srcdir:$srcdir:$PATH
+PATH=@abs_builddir@:@abs_top_builddir@/src:@abs_top_srcdir@/build-aux:$top_srcdir:$srcdir:@VARNISH_SBINDIR@:$PATH
VARNISHTEST=@VARNISHTEST@
VARNISHD=@VARNISHD@
INITFILE=@abs_builddir@/.TESTINIT
diff --git a/tests/clear.at b/tests/clear.at
index 3705c64..3344bbf 100644
--- a/tests/clear.at
+++ b/tests/clear.at
@@ -17,7 +17,7 @@
AT_SETUP(clear)
AT_KEYWORDS(clear)
-AT_VARNISHTEST([variable],[
+AT_VARNISHTEST([
sub vcl_recv {
variable.set("foo", req.http.Host);
variable.set("bar","two");
diff --git a/tests/complex.at b/tests/complex.at
index 16fe573..5f3a6ee 100644
--- a/tests/complex.at
+++ b/tests/complex.at
@@ -17,7 +17,7 @@
AT_SETUP(complex)
AT_KEYWORDS(complex)
-AT_VARNISHTEST([variable],[
+AT_VARNISHTEST([
sub vcl_recv {
variable.set("foo", req.http.Host);
variable.set("bar","two");
diff --git a/tests/defined.at b/tests/defined.at
index 3d0d071..4844e12 100644
--- a/tests/defined.at
+++ b/tests/defined.at
@@ -17,7 +17,7 @@
AT_SETUP(defined)
AT_KEYWORDS(defined)
-AT_VARNISHTEST([variable],[
+AT_VARNISHTEST([
sub vcl_recv {
variable.set("string", "test");
}
diff --git a/tests/duration.at b/tests/duration.at
index 0a3f1b7..f560898 100644
--- a/tests/duration.at
+++ b/tests/duration.at
@@ -17,7 +17,7 @@
AT_SETUP(duration)
AT_KEYWORDS(duration)
-AT_VARNISHTEST([variable],[
+AT_VARNISHTEST([
sub vcl_recv {
variable.set_duration("minute", 1m);
variable.set_duration("hour",1h);
diff --git a/tests/gstring.at b/tests/gstring.at
index bcf7beb..cf43583 100644
--- a/tests/gstring.at
+++ b/tests/gstring.at
@@ -17,7 +17,7 @@
AT_SETUP(global string)
AT_KEYWORDS(global string gstring)
-AT_VARNISHTEST([variable],[
+AT_VARNISHTEST([
sub vcl_recv {
if (req.url == "/") {
variable.global_set("host", req.http.Host);
diff --git a/tests/int.at b/tests/int.at
index 1a7a50b..5f016bf 100644
--- a/tests/int.at
+++ b/tests/int.at
@@ -17,7 +17,7 @@
AT_SETUP(int)
AT_KEYWORDS(int)
-AT_VARNISHTEST([variable],[
+AT_VARNISHTEST([
sub vcl_recv {
variable.set_int("ten", 10);
variable.set_int("five",5);
diff --git a/tests/queryset00.at b/tests/queryset00.at
index 230f0a5..8a7541b 100644
--- a/tests/queryset00.at
+++ b/tests/queryset00.at
@@ -17,7 +17,7 @@
AT_SETUP(all variables)
AT_KEYWORDS(queryset queryset00)
-AT_VARNISHTEST([variable],[
+AT_VARNISHTEST([
sub vcl_recv {
variable.queryset("", regsub(req.url, ".*\?(.+)", "\1"));
}
diff --git a/tests/queryset01.at b/tests/queryset01.at
index 3a9b7fb..3768f5c 100644
--- a/tests/queryset01.at
+++ b/tests/queryset01.at
@@ -17,7 +17,7 @@
AT_SETUP(selected variables)
AT_KEYWORDS(queryset queryset01)
-AT_VARNISHTEST([variable],[
+AT_VARNISHTEST([
sub vcl_recv {
variable.queryset("x:i,foo", regsub(req.url, ".*\?(.+)", "\1"));
}
diff --git a/tests/real.at b/tests/real.at
index 6692991..74e8f39 100644
--- a/tests/real.at
+++ b/tests/real.at
@@ -17,7 +17,7 @@
AT_SETUP(real)
AT_KEYWORDS(real)
-AT_VARNISHTEST([variable],[
+AT_VARNISHTEST([
sub vcl_recv {
variable.set_real("one-half", 0.5);
variable.set_real("one-fourth",0.25);
diff --git a/tests/regset.at b/tests/regset.at
index d942ad2..9ee894d 100644
--- a/tests/regset.at
+++ b/tests/regset.at
@@ -17,7 +17,7 @@
AT_SETUP(regset)
AT_KEYWORDS(regset)
-AT_VARNISHTEST([variable],[
+AT_VARNISHTEST([
sub vcl_recv {
variable.regset("y:i,x,time:d=\3s", "^/(\d+)/(.+)/(\d+)", req.url);
}
diff --git a/tests/string.at b/tests/string.at
index 8d9c82e..d0e8248 100644
--- a/tests/string.at
+++ b/tests/string.at
@@ -17,7 +17,7 @@
AT_SETUP(string)
AT_KEYWORDS(string)
-AT_VARNISHTEST([variable],[
+AT_VARNISHTEST([
sub vcl_recv {
variable.set("foo", req.http.Host);
variable.set("bar","two");
diff --git a/tests/type_of.at b/tests/type_of.at
index a67507e..bc57c88 100644
--- a/tests/type_of.at
+++ b/tests/type_of.at
@@ -17,7 +17,7 @@
AT_SETUP(type_of)
AT_KEYWORDS(type_of)
-AT_VARNISHTEST([variable],[
+AT_VARNISHTEST([
sub vcl_recv {
variable.set("s", "test");
variable.set_int("i", 1);
diff --git a/tests/unset.at b/tests/unset.at
index 330b852..3814547 100644
--- a/tests/unset.at
+++ b/tests/unset.at
@@ -17,7 +17,7 @@
AT_SETUP(unset)
AT_KEYWORDS(unset)
-AT_VARNISHTEST([variable],[
+AT_VARNISHTEST([
sub vcl_recv {
variable.set("s", "test");
variable.set("t", "foo");

Return to:

Send suggestions and report system problems to the System administrator.