summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org>2018-12-10 11:34:26 (GMT)
committer Sergey Poznyakoff <gray@gnu.org>2018-12-10 11:35:46 (GMT)
commit64853618b1c0ae890772aaad3ef75ffe6fdce67a (patch) (side-by-side diff)
treef3f270896ae5652d357c209331459cb9bb97b12c
parentab8851545baad4d84dd7f42336dd3de9accdba5f (diff)
downloadvmod-binlog-64853618b1c0ae890772aaad3ef75ffe6fdce67a.tar.gz
vmod-binlog-64853618b1c0ae890772aaad3ef75ffe6fdce67a.tar.bz2
Version 2.3
Support for Varnish API 6.0.2
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--.gitignore1
-rw-r--r--NEWS10
-rw-r--r--README5
m---------acvmod0
-rw-r--r--configure.ac9
-rw-r--r--doc/vmod-binlog.36
-rw-r--r--src/binlog.c18
7 files changed, 30 insertions, 19 deletions
diff --git a/.gitignore b/.gitignore
index 506e185..4ae0169 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,2 +25,3 @@ configure
core
+libltdl
libtool
diff --git a/NEWS b/NEWS
index be596dd..4e3b1fb 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,2 @@
-Vmod-binlog NEWS -- history of user-visible changes. 2017-08-10
-Copyright (C) 2013-2017 Sergey Poznyakoff
+Vmod-binlog NEWS -- history of user-visible changes. 2018-12-10
See the end of file for copying conditions.
@@ -6,2 +5,7 @@ Please send Vmod-binlog bug reports to <gray@gnu.org>
+Version 2.3, 2018-12-10
+
+* Support for Varnish 6.0.2
+
+
Version 2.2, 2017-08-10
@@ -33,3 +37,3 @@ Initial release.
-Copyright (C) 2013-2017 Sergey Poznyakoff
+Copyright (C) 2013-2018 Sergey Poznyakoff
diff --git a/README b/README
index c1d552b..ff926e0 100644
--- a/README
+++ b/README
@@ -1,3 +1,2 @@
Vmod-binlog README
-Copyright (C) 2013-2017 Sergey Poznyakoff
See the end of file for copying conditions.
@@ -25,3 +24,3 @@ and searching in binary log files.
-The module was tested with Varnish versions 4.1, and 5.1.
+The module was tested with Varnish versions 4.1 through 6.0.2.
@@ -94,3 +93,3 @@ Send bug reports and suggestions to <gray@gnu.org>
-Copyright (C) 2013-2017 Sergey Poznyakoff
+Copyright (C) 2013-2018 Sergey Poznyakoff
diff --git a/acvmod b/acvmod
-Subproject 5f6dce2f7dd35a154333bb42d134a018b981f81
+Subproject 5b214e3d72f9e261a37cf31deb41e7f8a61a181
diff --git a/configure.ac b/configure.ac
index 1ad400d..bdb25c1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,3 +1,3 @@
# This file is part of vmod-binlog
-# Copyright (C) 2013-2017 Sergey Poznyakoff
+# Copyright (C) 2013-2018 Sergey Poznyakoff
#
@@ -16,3 +16,3 @@
AC_PREREQ(2.69)
-AC_INIT([vmod-binlog], 2.2, [gray@gnu.org])
+AC_INIT([vmod-binlog], 2.3, [gray@gnu.org])
AC_CONFIG_AUX_DIR([build-aux])
@@ -54,4 +54,5 @@ AC_CHECK_HEADERS([sys/stdlib.h])
-AM_VARNISHAPI([4.1],[5.1])
-
+AM_VARNISHAPI([4.1],[6.0.2])
+AC_DEFINE_UNQUOTED([VARNISHAPI_MAJOR],[$VARNISHAPI_MAJOR],
+ [Varnish API major version number])
AC_SUBST(BINLOGSEL_MODDIR,'$(libdir)/$(PACKAGE)')
diff --git a/doc/vmod-binlog.3 b/doc/vmod-binlog.3
index 66dbc5a..97b942a 100644
--- a/doc/vmod-binlog.3
+++ b/doc/vmod-binlog.3
@@ -1,3 +1,3 @@
.\" This file is part of Vmod-binlog -*- nroff -*-
-.\" Copyright (C) 2013-2014 Sergey Poznyakoff
+.\" Copyright (C) 2013-2018 Sergey Poznyakoff
.\"
@@ -15,3 +15,3 @@
.\" along with vmod-binlog. If not, see <http://www.gnu.org/licenses/>.
-.TH VMOD-BINLOG 1 "November 1, 2014" "VMOD-BINLOG" "User Reference"
+.TH VMOD-BINLOG 1 "December 10, 2018" "VMOD-BINLOG" "User Reference"
.SH NAME
@@ -259,3 +259,3 @@ the repeat count.
. ds package vmod-binlog
-. ds version 1.0
+. ds version 2.3
. so download.inc
diff --git a/src/binlog.c b/src/binlog.c
index b2d581c..8263c12 100644
--- a/src/binlog.c
+++ b/src/binlog.c
@@ -1,3 +1,3 @@
/* This file is part of vmod-binlog
- Copyright (C) 2013, 2014, 2016, 2017 Sergey Poznyakoff
+ Copyright (C) 2013-2018 Sergey Poznyakoff
@@ -29,7 +29,13 @@
#include <time.h>
-#include "vcl.h"
-#include "vrt.h"
-#include "vcc_if.h"
-
-#include "cache/cache.h"
+#include <string.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)

Return to:

Send suggestions and report system problems to the System administrator.