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,3 +1,2 @@
-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.
@@ -6,2 +5,5 @@ Please send vmod_dict bug reports to <gray@gnu.org>
 
+Version 1.2, 2018-12-10
+
+* Support for Varnish 6.0.2
 
@@ -19,3 +21,3 @@ Copyright information:
 
-Copyright (C) 2017 Sergey Poznyakoff
+Copyright (C) 2017-2018 Sergey Poznyakoff
 
diff --git a/README b/README
index 2109a6b..7c4a5c5 100644
--- a/README
+++ b/README
@@ -1,3 +1,2 @@
 Vmod_dict README
-Copyright (C) 2017 Sergey Poznyakoff
 See the end of file for copying conditions.
@@ -44,3 +43,3 @@ 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.
 
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,3 +1,3 @@
 # This file is part of vmod_dict.
-# Copyright (C) 2017 Sergey Poznyakoff
+# Copyright (C) 2017-2018 Sergey Poznyakoff
 # 
@@ -17,3 +17,3 @@
 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])
@@ -47,3 +47,5 @@ AC_HEADER_STDC
 
-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])
 
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,3 +1,3 @@
 /* This file is part of vmod_dict.
-   Copyright (C) 2017 Sergey Poznyakoff
+   Copyright (C) 2017-2018 Sergey Poznyakoff
    
@@ -24,7 +24,13 @@
 #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>