summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org>2018-12-10 11:59:53 (GMT)
committer Sergey Poznyakoff <gray@gnu.org>2018-12-10 12:00:55 (GMT)
commit841a9f6fa1e3dfa1323be6212056ecd28d21b696 (patch) (side-by-side diff)
treef4ca4d8ed1451d0e4a680cfad7ac1230287ba943
parent691d208edcf53d48e2401340f1aec2adae8661c8 (diff)
downloadvmod-dbrw-841a9f6fa1e3dfa1323be6212056ecd28d21b696.tar.gz
vmod-dbrw-841a9f6fa1e3dfa1323be6212056ecd28d21b696.tar.bz2
Version 2.4; Support for varnish 6.0.2release-2.4
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--NEWS7
m---------acvmod0
-rw-r--r--configure.ac6
-rw-r--r--doc/vmod-dbrw.32
-rw-r--r--src/dbrw.h14
5 files changed, 21 insertions, 8 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 <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
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
@@ -14,7 +14,7 @@
# 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)
@@ -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 <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;

Return to:

Send suggestions and report system problems to the System administrator.