diff options
author | Sergey Poznyakoff <gray@gnu.org> | 2018-12-10 15:37:46 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org> | 2018-12-10 15:37:46 +0200 |
commit | 5b18b9c1e8d0e0ad14937669a931a1a358e65091 (patch) | |
tree | 155fad81320aa1d742513b4c64a7c024ed437b2e | |
parent | a29737fc04272ac38d639ac25841183db1052fbc (diff) | |
download | vmod-dict-release-1.2.tar.gz vmod-dict-release-1.2.tar.bz2 |
Version 1.2 (support for Varnish 6.0.2)release-1.2
-rw-r--r-- | NEWS | 8 | ||||
-rw-r--r-- | README | 3 | ||||
m--------- | acvmod | 0 | ||||
-rw-r--r-- | configure.ac | 8 | ||||
-rw-r--r-- | src/vmod_dict.c | 18 |
5 files changed, 23 insertions, 14 deletions
@@ -1,9 +1,11 @@ -vmod_dict -- history of user-visible changes. 2017-08-10 -Copyright (C) 2017 Sergey Poznyakoff +vmod_dict -- history of user-visible changes. 2018-12-10 See the end of file for copying conditions. Please send vmod_dict bug reports to <gray@gnu.org> + +Version 1.2, 2018-12-10 +* Support for Varnish 6.0.2 Version 1.1, 2017-08-10 @@ -17,7 +19,7 @@ Initial release ========================================================================= Copyright information: -Copyright (C) 2017 Sergey Poznyakoff +Copyright (C) 2017-2018 Sergey Poznyakoff Permission is granted to anyone to make or distribute verbatim copies of this document as received, in any medium, provided that the @@ -1,5 +1,4 @@ Vmod_dict README -Copyright (C) 2017 Sergey Poznyakoff See the end of file for copying conditions. * Introduction @@ -42,7 +41,7 @@ as follows: In order to compile the package you need to have installed varnishd and varnishapi package. The module has been tested with -Varnish versions 4.1 and 5.1. +Varnish versions 4.1, 5.1, and 6.0.2. Supposing that condition is met, run: diff --git a/acvmod b/acvmod -Subproject 5f6dce2f7dd35a154333bb42d134a018b981f81 +Subproject 5b214e3d72f9e261a37cf31deb41e7f8a61a181 diff --git a/configure.ac b/configure.ac index 5d50849..1054289 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ # This file is part of vmod_dict. -# Copyright (C) 2017 Sergey Poznyakoff +# Copyright (C) 2017-2018 Sergey Poznyakoff # # Vmod_dict is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -15,7 +15,7 @@ # along with vmod_dict. If not, see <http://www.gnu.org/licenses/>. AC_PREREQ(2.69) -AC_INIT([vmod-dict], [1.1], [gray@gnu.org]) +AC_INIT([vmod-dict], [1.2], [gray@gnu.org]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR(src/vmod_dict.vcc) @@ -45,7 +45,9 @@ AC_HEADER_STDC # Check for functions -AM_VARNISHAPI([4.1],[5.1]) +AM_VARNISHAPI([4.1],[6.0.9]) +AC_DEFINE_UNQUOTED([VARNISHAPI_MAJOR],[$VARNISHAPI_MAJOR], + [Varnish API major version number]) AC_CONFIG_TESTDIR(tests) AC_CONFIG_FILES([tests/Makefile tests/atlocal]) diff --git a/src/vmod_dict.c b/src/vmod_dict.c index 04ee52c..f9114d1 100644 --- a/src/vmod_dict.c +++ b/src/vmod_dict.c @@ -1,5 +1,5 @@ /* This file is part of vmod_dict. - Copyright (C) 2017 Sergey Poznyakoff + Copyright (C) 2017-2018 Sergey Poznyakoff Vmod_dict is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -22,11 +22,17 @@ #include <limits.h> #include <ctype.h> #include <syslog.h> -#include "vcl.h" -#include "vrt.h" -#include "vas.h" -#include "cache/cache.h" -#include "vcc_if.h" +#if VARNISHAPI_MAJOR > 5 +# include <cache/cache.h> +# include <vcl.h> +# include <vcc_if.h> +#else +# include <vcl.h> +# include <vrt.h> +# include <vcc_if.h> +# include <cache/cache.h> +#endif +#include <vas.h> struct entry { |