summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org.ua>2017-08-10 09:32:50 (GMT)
committer Sergey Poznyakoff <gray@gnu.org.ua>2017-08-10 09:36:09 (GMT)
commit819123e3ed9c7d6708630ea38cec59aee14b04c5 (patch) (side-by-side diff)
treed0c47f41e72d113eb9d0906bdc16f52825fd14ae
parent1096ae69c4d22d60df5bc89c15f7abbcf2c769c8 (diff)
downloadvmod-dbrw-819123e3ed9c7d6708630ea38cec59aee14b04c5.tar.gz
vmod-dbrw-819123e3ed9c7d6708630ea38cec59aee14b04c5.tar.bz2
Support for varnish 5.1.
* configure.ac: Set version 2.2 (AC_VMOD_BASENAME): New subst variable. * NEWS: Document changes. * README: Document changes. * acvmod: Updated. * tests/Makefile.am: Define AT_VMOD_BASENAME in package.m4 * tests/atlocal.in (at_vcl_backend): Start vtc with varnsishtest stanza
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--NEWS7
-rw-r--r--README4
m---------acvmod0
-rw-r--r--configure.ac3
-rw-r--r--tests/Makefile.am1
-rw-r--r--tests/atlocal.in4
6 files changed, 14 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index 8921287..6895824 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,14 @@
-vmod-dbrw -- history of user-visible changes. 2017-08-06
+vmod-dbrw -- history of user-visible changes. 2017-08-10
Copyright (C) 2013-2017 Sergey Poznyakoff
See the end of file for copying conditions.
Please send vmod-dbrw bug reports to <gray@gnu.org>
+Version 2.2, 2017-08-10
+
+* Support for Varnish 5.1
+
+
Version 2.1, 2017-08-06
* Requires Varnish 4.1
diff --git a/README b/README
index a741783..be4e408 100644
--- a/README
+++ b/README
@@ -30,8 +30,8 @@ structure, considerably speeding up their handling. Another advantage
of this approach is that rewrite rules stored in a database are easier
to maintain.
-This version supports MySQL and PostgreSQL databases and compiles for
-both Varnish 3.x and 4.x.
+This version supports MySQL and PostgreSQL databases and is known to
+work for Varnish 4.1 and 5.1.
* Example
diff --git a/acvmod b/acvmod
-Subproject ba32780019480b89cd9d796b93a76cae6afe99a
+Subproject 43ef3ce139aa5ddb9aa0437c356a86290536900
diff --git a/configure.ac b/configure.ac
index 51e8c92..8b9ff5c 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-dbrw. If not, see <http://www.gnu.org/licenses/>.
AC_PREREQ(2.69)
-AC_INIT([vmod-dbrw], 2.1, [gray@gnu.org])
+AC_INIT([vmod-dbrw], 2.2, [gray@gnu.org])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR(src/vmod_dbrw.vcc)
AM_CONFIG_HEADER(config.h)
+AC_SUBST([AC_VMOD_BASENAME],[dbrw])
AC_CANONICAL_SYSTEM
AC_LANG(C)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index b433468..792ce24 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 b8b4066..18a0b69 100644
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -2,7 +2,7 @@
# Configurable variable values for vmod-dbrw test suite.
# Copyright (C) 2013-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
INITFILE=@abs_builddir@/.TESTINIT
FAILFILE=@abs_builddir@/FAILURE
VARNISHD=@VARNISHD@
@@ -34,6 +34,8 @@ fi
at_vcl_backend() {
cat <<EOT
+varnishtest "$at_desc"
+
server s1 {
rxreq
txresp

Return to:

Send suggestions and report system problems to the System administrator.