Version 1.2 (support for Varnish 6.0.2)release-1.2

5 files changed, 23 insertions, 14 deletions

diff --git a/NEWS b/NEWS
index ca8f679..dc2ba29 100644
--- a/NEWS
+++ b/NEWS
@@ -1,12 +1,14 @@
-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
 
 * Support for Varnish 5.1
 
 
@@ -14,13 +16,13 @@ Version 1.0, 2017-08-06
 
 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
    copyright notice and this permission notice are preserved,
    thus giving the recipient permission to redistribute in turn.
 
diff --git a/README b/README
index 2109a6b..7c4a5c5 100644
--- a/README
+++ b/README
@@ -1,8 +1,7 @@
 Vmod_dict README
-Copyright (C) 2017 Sergey Poznyakoff
 See the end of file for copying conditions.
 
 * Introduction
 
 This file contains brief information about configuring, testing
 and using vmod_dict. It is *not* intended as a replacement
@@ -39,13 +38,13 @@ as follows:
    set req.http.X-Value = dict.lookup("key");
 
 * Installation
 
 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:
 
   ./configure
 
 It should be able to automatically find the necessary components. In case 
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,8 +1,8 @@
 # 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
 # the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 # 
@@ -12,13 +12,13 @@
 # GNU General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
 # 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)
 AM_CONFIG_HEADER(config.h)
 
 AC_SUBST([AC_VMOD_BASENAME],[dict])
@@ -42,13 +42,15 @@ AC_PROG_MAKE_SET
 
 # Checks for header files.
 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])
 AM_MISSING_PROG([AUTOM4TE], [autom4te])
 
 AC_CONFIG_FILES([
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,8 +1,8 @@
 /* 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
    the Free Software Foundation; either version 3, or (at your option)
    any later version.
    
@@ -19,17 +19,23 @@
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
 #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
 {
 	char *key;
 	char *val;
 	size_t hash;