From 841a9f6fa1e3dfa1323be6212056ecd28d21b696 Mon Sep 17 00:00:00 2001 From: Sergey Poznyakoff Date: Mon, 10 Dec 2018 13:59:53 +0200 Subject: Version 2.4; Support for varnish 6.0.2 --- NEWS | 7 ++++++- acvmod | 2 +- configure.ac | 6 ++++-- doc/vmod-dbrw.3 | 2 +- src/dbrw.h | 14 ++++++++++---- 5 files changed, 22 insertions(+), 9 deletions(-) diff --git a/NEWS b/NEWS index 3ee8124..0300ec3 100644 --- a/NEWS +++ b/NEWS @@ -1,8 +1,13 @@ -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 +Version 2.4, 2018-12-10 + +* Support for Varnish version 6.0.2 + + Version 2.3, 2018-12-08 * SQL idle timeout diff --git a/acvmod b/acvmod index 5f6dce2..5b214e3 160000 --- a/acvmod +++ b/acvmod @@ -1 +1 @@ -Subproject commit 5f6dce2f7dd35a154333bb42d134a018b981f812 +Subproject commit 5b214e3d72f9e261a37cf31deb41e7f8a61a1811 diff --git a/configure.ac b/configure.ac index 420041e..62c3afe 100644 --- a/configure.ac +++ b/configure.ac @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with vmod-dbrw. If not, see . 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) @@ -43,7 +43,9 @@ AC_PROG_MAKE_SET 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 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 @@ -298,7 +298,7 @@ sub vcl_synth { .\" 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" diff --git a/src/dbrw.h b/src/dbrw.h index 1ff1056..bd0aa2a 100644 --- a/src/dbrw.h +++ b/src/dbrw.h @@ -21,10 +21,16 @@ #include #include -#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; -- cgit v1.2.1