summaryrefslogtreecommitdiffabout
Side-by-side diff
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
@@ -20,9 +20,10 @@ build-aux
config.h
config.h.in
config.log
config.status
configure
core
+libltdl
libtool
m4
stamp-h1
diff --git a/NEWS b/NEWS
index be596dd..4e3b1fb 100644
--- a/NEWS
+++ b/NEWS
@@ -1,12 +1,16 @@
-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.
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
* Support for Varnish 5.1
Version 2.1, 2017-08-05
@@ -28,13 +32,13 @@ Version 1.0, 2013-10-19
Initial release.
* Copyright information:
-Copyright (C) 2013-2017 Sergey Poznyakoff
+Copyright (C) 2013-2018 Sergey Poznyakoff
Permission is granted to anyone to make or distribute verbatim copies
of this document as received, in any medium, provided that the
copyright notice and this permission notice are preserved,
thus giving the recipient permission to redistribute in turn.
diff --git a/README b/README
index c1d552b..ff926e0 100644
--- a/README
+++ b/README
@@ -1,8 +1,7 @@
Vmod-binlog README
-Copyright (C) 2013-2017 Sergey Poznyakoff
See the end of file for copying conditions.
* Introduction
This file contains brief information about configuring, testing
and using vmod-binlog. It is *not* intended as a replacement
@@ -20,13 +19,13 @@ records. Each record contains a UNIX timestamp in binary form and
arbitrary user-defined data. Such files are convenient for storing
big amounts of information arriving at high rates.
The package provides the module itself and the utilities for listing
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.
* Installation
In order to compile the package you need to have the varnishd and varnishapi
packages installed.
@@ -89,13 +88,13 @@ http://www.gnu.org.ua/software/vmod-binlog.
Send bug reports and suggestions to <gray@gnu.org>
* Copyright information:
-Copyright (C) 2013-2017 Sergey Poznyakoff
+Copyright (C) 2013-2018 Sergey Poznyakoff
Permission is granted to anyone to make or distribute verbatim copies
of this document as received, in any medium, provided that the
copyright notice and this permission notice are preserved,
thus giving the recipient permission to redistribute in turn.
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,8 +1,8 @@
# This file is part of vmod-binlog
-# Copyright (C) 2013-2017 Sergey Poznyakoff
+# Copyright (C) 2013-2018 Sergey Poznyakoff
#
# Vmod-binlog is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3, or (at your option)
# any later version.
#
@@ -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-binlog. If not, see <http://www.gnu.org/licenses/>.
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])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR(src/binlog.c)
AM_CONFIG_HEADER(config.h)
AC_SUBST([AC_VMOD_BASENAME],[binlog])
@@ -49,14 +49,15 @@ AC_CONFIG_FILES([libltdl/Makefile])
AC_SYS_LARGEFILE
# Checks for header files.
AC_HEADER_STDC
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)')
# Initialize the test suite.
AC_CONFIG_TESTDIR(tests)
AC_CONFIG_FILES([tests/Makefile tests/atlocal])
AM_MISSING_PROG([AUTOM4TE], [autom4te])
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,8 +1,8 @@
.\" This file is part of Vmod-binlog -*- nroff -*-
-.\" Copyright (C) 2013-2014 Sergey Poznyakoff
+.\" Copyright (C) 2013-2018 Sergey Poznyakoff
.\"
.\" Vmod-binlog is free software; you can redistribute it and/or modify
.\" it under the terms of the GNU General Public License as published by
.\" the Free Software Foundation; either version 3, or (at your option)
.\" any later version.
.\"
@@ -10,13 +10,13 @@
.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
.\" 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-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
vmod\-binlog \- binary log file support for Varnish Cache.
.SH SYNOPSIS
.B import binlog;
.BI "VOID binlog.init(STRING " dir ", STRING " format ", STRING " param ");"
@@ -254,13 +254,13 @@ the repeat count.
.\" 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-binlog
-. ds version 1.0
+. ds version 2.3
. so download.inc
\}
.SH "SEE ALSO"
.BR binlogcat (1),
.BR binlogsel (1),
.BR vcl (7),
diff --git a/src/binlog.c b/src/binlog.c
index b2d581c..8263c12 100644
--- a/src/binlog.c
+++ b/src/binlog.c
@@ -1,8 +1,8 @@
/* This file is part of vmod-binlog
- Copyright (C) 2013, 2014, 2016, 2017 Sergey Poznyakoff
+ Copyright (C) 2013-2018 Sergey Poznyakoff
Vmod-binlog is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
any later version.
@@ -24,17 +24,23 @@
#include <syslog.h>
#include <stddef.h>
#include <stdlib.h>
#include <stdarg.h>
#include <ctype.h>
#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)
#include "vmod-binlog.h"
#include "pack.h"
#include "pthread.h"

Return to:

Send suggestions and report system problems to the System administrator.