diff options
| -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,8 +1,10 @@ -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 @@ -18,5 +20,5 @@ 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 @@ -1,4 +1,3 @@ Vmod_dict README -Copyright (C) 2017 Sergey Poznyakoff See the end of file for copying conditions. @@ -43,5 +42,5 @@ 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,4 +1,4 @@ # 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 @@ -16,5 +16,5 @@ 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]) @@ -46,5 +46,7 @@ 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) 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,4 +1,4 @@ /* 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 @@ -23,9 +23,15 @@ #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 |