diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2017-08-10 12:32:50 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2017-08-10 12:36:09 +0300 |
commit | 819123e3ed9c7d6708630ea38cec59aee14b04c5 (patch) | |
tree | d0c47f41e72d113eb9d0906bdc16f52825fd14ae | |
parent | 1096ae69c4d22d60df5bc89c15f7abbcf2c769c8 (diff) | |
download | vmod-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
-rw-r--r-- | NEWS | 7 | ||||
-rw-r--r-- | README | 4 | ||||
m--------- | acvmod | 0 | ||||
-rw-r--r-- | configure.ac | 3 | ||||
-rw-r--r-- | tests/Makefile.am | 1 | ||||
-rw-r--r-- | tests/atlocal.in | 4 |
6 files changed, 14 insertions, 5 deletions
@@ -1,12 +1,17 @@ -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 * The --with-varnish-source option has been withdrawn @@ -27,14 +27,14 @@ rewrite rules. Its intended use is for web sites that need an exceedingly big number of redirect and/or rewrite rules. Vmod-dbrw allows you to keep all rules in an SQL database of arbitrary 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 ** Simplest case The redirection database has the following structure 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 @@ -11,18 +11,19 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # 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) AM_INIT_AUTOMAKE([gnu tar-ustar silent-rules]) AM_SILENT_RULES([yes]) diff --git a/tests/Makefile.am b/tests/Makefile.am index b433468..792ce24 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -28,12 +28,13 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac echo '# Signature of the current package.'; \ echo 'm4_define([AT_PACKAGE_NAME], [@PACKAGE_NAME@])'; \ echo 'm4_define([AT_PACKAGE_TARNAME], [@PACKAGE_TARNAME@])'; \ 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 # ## ------------ ## ## Test suite. ## diff --git a/tests/atlocal.in b/tests/atlocal.in index b8b4066..18a0b69 100644 --- a/tests/atlocal.in +++ b/tests/atlocal.in @@ -1,11 +1,11 @@ # @configure_input@ -*- shell-script -*- # 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@ VARNISHTEST="@VARNISHTEST@ -Dvarnishd=$VARNISHD" VARNISHVERSION=@VARNISH_MAJOR@ : ${DBRW_TEST_DBTYPE=@DBRW_TEST_DBTYPE@} @@ -31,12 +31,14 @@ fi if [ -n "$DBRW_TEST_DEBUG" ]; then DBRW_TEST_PARAMS="$DBRW_TEST_PARAMS;debug=$DBRW_TEST_DEBUG" fi at_vcl_backend() { cat <<EOT +varnishtest "$at_desc" + server s1 { rxreq txresp } -start varnish v1 -vcl+backend { |