Version 2.4; Support for varnish 6.0.2release-2.4

5 files changed, 21 insertions, 8 deletions

diff --git a/NEWS b/NEWS
index 3ee8124..0300ec3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,11 +1,16 @@
-vmod-dbrw -- history of user-visible changes. 2018-12-08
+vmod-dbrw -- history of user-visible changes. 2018-12-10
 See the end of file for copying conditions.
 
 Please send vmod-dbrw bug reports to <gray@gnu.org>
 
+Version 2.4, 2018-12-10
+
+* Support for Varnish version 6.0.2
+
+
 Version 2.3, 2018-12-08
 
 * SQL idle timeout
 
 For MySQL backend, the default connection idle timeout is set equal to
 the value of the MySQL variable 'wait_timeout'. For Postgres, default
diff --git a/acvmod b/acvmod
-Subproject 5f6dce2f7dd35a154333bb42d134a018b981f81
+Subproject 5b214e3d72f9e261a37cf31deb41e7f8a61a181
diff --git a/configure.ac b/configure.ac
index 420041e..62c3afe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,13 +11,13 @@
 # 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.3, [gray@gnu.org])
+AC_INIT([vmod-dbrw], 2.4, [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])
@@ -40,13 +40,15 @@ AC_PROG_LIBTOOL
 AC_PROG_MAKE_SET
 
 # Checks for header files.
 AC_HEADER_STDC
 AC_CHECK_HEADERS([sys/stdlib.h])
 
-AM_VARNISHAPI([4.1],[5.2.1])
+AM_VARNISHAPI([4.1],[6.0.2])
+AC_DEFINE_UNQUOTED([VARNISHAPI_MAJOR],[$VARNISHAPI_MAJOR],
+                   [Varnish API major version number])
 
 ###########
 # Check for SQL support       
 build_mysql=probe
 build_pgsql=probe
 
diff --git a/doc/vmod-dbrw.3 b/doc/vmod-dbrw.3
index 21d15e2..f069ce2 100644
--- a/doc/vmod-dbrw.3
+++ b/doc/vmod-dbrw.3
@@ -295,13 +295,13 @@ sub vcl_synth {
 .EE
 .\" The MANCGI variable is set by man.cgi script on Ulysses.
 .\" The download.inc file contains the default DOWNLOAD section
 .\" for man-based doc pages.
 .if "\V[MANCGI]"WEBDOC" \{\
 .       ds package vmod-dbrw
-.       ds version 2.2.91
+.       ds version 2.4
 .       so download.inc
 \}
 .SH "SEE ALSO"
 .BR vcl (7),
 .BR varnishd (1).
 .PP
diff --git a/src/dbrw.h b/src/dbrw.h
index 1ff1056..bd0aa2a 100644
--- a/src/dbrw.h
+++ b/src/dbrw.h
@@ -18,16 +18,22 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 #include <syslog.h>
 #include <regex.h>
 
-#include "vcl.h"
-#include "vrt.h"
-#include "vcc_if.h"
-#include "cache/cache.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
 #define WSPTR(s) ((s)->ws)
 
 struct dbrw_connection;
 
 struct dbrw_backend {
         char *name;