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) (unidiff)
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
@@ -23,6 +23,7 @@ config.log
23config.status 23config.status
24configure 24configure
25core 25core
26libltdl
26libtool 27libtool
27m4 28m4
28stamp-h1 29stamp-h1
diff --git a/NEWS b/NEWS
index be596dd..4e3b1fb 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,13 @@
1Vmod-binlog NEWS -- history of user-visible changes. 2017-08-10 1Vmod-binlog NEWS -- history of user-visible changes. 2018-12-10
2Copyright (C) 2013-2017 Sergey Poznyakoff
3See the end of file for copying conditions. 2See the end of file for copying conditions.
4 3
5Please send Vmod-binlog bug reports to <gray@gnu.org> 4Please send Vmod-binlog bug reports to <gray@gnu.org>
6 5
6Version 2.3, 2018-12-10
7
8* Support for Varnish 6.0.2
9
10
7Version 2.2, 2017-08-10 11Version 2.2, 2017-08-10
8 12
9* Support for Varnish 5.1 13* Support for Varnish 5.1
@@ -31,7 +35,7 @@ Initial release.
31 35
32* Copyright information: 36* Copyright information:
33 37
34Copyright (C) 2013-2017 Sergey Poznyakoff 38Copyright (C) 2013-2018 Sergey Poznyakoff
35 39
36 Permission is granted to anyone to make or distribute verbatim copies 40 Permission is granted to anyone to make or distribute verbatim copies
37 of this document as received, in any medium, provided that the 41 of this document as received, in any medium, provided that the
diff --git a/README b/README
index c1d552b..ff926e0 100644
--- a/README
+++ b/README
@@ -1,5 +1,4 @@
1Vmod-binlog README 1Vmod-binlog README
2Copyright (C) 2013-2017 Sergey Poznyakoff
3See the end of file for copying conditions. 2See the end of file for copying conditions.
4 3
5* Introduction 4* Introduction
@@ -23,7 +22,7 @@ big amounts of information arriving at high rates.
23The package provides the module itself and the utilities for listing 22The package provides the module itself and the utilities for listing
24and searching in binary log files. 23and searching in binary log files.
25 24
26The module was tested with Varnish versions 4.1, and 5.1. 25The module was tested with Varnish versions 4.1 through 6.0.2.
27 26
28* Installation 27* Installation
29 28
@@ -92,7 +91,7 @@ Send bug reports and suggestions to <gray@gnu.org>
92 91
93* Copyright information: 92* Copyright information:
94 93
95Copyright (C) 2013-2017 Sergey Poznyakoff 94Copyright (C) 2013-2018 Sergey Poznyakoff
96 95
97 Permission is granted to anyone to make or distribute verbatim copies 96 Permission is granted to anyone to make or distribute verbatim copies
98 of this document as received, in any medium, provided that the 97 of this document as received, in any medium, provided that the
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,5 +1,5 @@
1# This file is part of vmod-binlog 1# This file is part of vmod-binlog
2# Copyright (C) 2013-2017 Sergey Poznyakoff 2# Copyright (C) 2013-2018 Sergey Poznyakoff
3# 3#
4# Vmod-binlog is free software; you can redistribute it and/or modify 4# Vmod-binlog is free software; you can redistribute it and/or modify
5# it under the terms of the GNU General Public License as published by 5# it under the terms of the GNU General Public License as published by
@@ -14,7 +14,7 @@
14# You should have received a copy of the GNU General Public License 14# You should have received a copy of the GNU General Public License
15# along with vmod-binlog. If not, see <http://www.gnu.org/licenses/>. 15# along with vmod-binlog. If not, see <http://www.gnu.org/licenses/>.
16AC_PREREQ(2.69) 16AC_PREREQ(2.69)
17AC_INIT([vmod-binlog], 2.2, [gray@gnu.org]) 17AC_INIT([vmod-binlog], 2.3, [gray@gnu.org])
18AC_CONFIG_AUX_DIR([build-aux]) 18AC_CONFIG_AUX_DIR([build-aux])
19AC_CONFIG_MACRO_DIR([m4]) 19AC_CONFIG_MACRO_DIR([m4])
20AC_CONFIG_SRCDIR(src/binlog.c) 20AC_CONFIG_SRCDIR(src/binlog.c)
@@ -52,8 +52,9 @@ AC_SYS_LARGEFILE
52AC_HEADER_STDC 52AC_HEADER_STDC
53AC_CHECK_HEADERS([sys/stdlib.h]) 53AC_CHECK_HEADERS([sys/stdlib.h])
54 54
55AM_VARNISHAPI([4.1],[5.1]) 55AM_VARNISHAPI([4.1],[6.0.2])
56 56AC_DEFINE_UNQUOTED([VARNISHAPI_MAJOR],[$VARNISHAPI_MAJOR],
57 [Varnish API major version number])
57AC_SUBST(BINLOGSEL_MODDIR,'$(libdir)/$(PACKAGE)') 58AC_SUBST(BINLOGSEL_MODDIR,'$(libdir)/$(PACKAGE)')
58 59
59# Initialize the test suite. 60# Initialize the test suite.
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,5 +1,5 @@
1.\" This file is part of Vmod-binlog -*- nroff -*- 1.\" This file is part of Vmod-binlog -*- nroff -*-
2.\" Copyright (C) 2013-2014 Sergey Poznyakoff 2.\" Copyright (C) 2013-2018 Sergey Poznyakoff
3.\" 3.\"
4.\" Vmod-binlog is free software; you can redistribute it and/or modify 4.\" Vmod-binlog is free software; you can redistribute it and/or modify
5.\" it under the terms of the GNU General Public License as published by 5.\" it under the terms of the GNU General Public License as published by
@@ -13,7 +13,7 @@
13.\" 13.\"
14.\" You should have received a copy of the GNU General Public License 14.\" You should have received a copy of the GNU General Public License
15.\" along with vmod-binlog. If not, see <http://www.gnu.org/licenses/>. 15.\" along with vmod-binlog. If not, see <http://www.gnu.org/licenses/>.
16.TH VMOD-BINLOG 1 "November 1, 2014" "VMOD-BINLOG" "User Reference" 16.TH VMOD-BINLOG 1 "December 10, 2018" "VMOD-BINLOG" "User Reference"
17.SH NAME 17.SH NAME
18vmod\-binlog \- binary log file support for Varnish Cache. 18vmod\-binlog \- binary log file support for Varnish Cache.
19.SH SYNOPSIS 19.SH SYNOPSIS
@@ -257,7 +257,7 @@ the repeat count.
257.\" for man-based doc pages. 257.\" for man-based doc pages.
258.if "\V[MANCGI]"WEBDOC" \{\ 258.if "\V[MANCGI]"WEBDOC" \{\
259 .ds package vmod-binlog 259 .ds package vmod-binlog
260 .ds version 1.0 260 .ds version 2.3
261 .so download.inc 261 .so download.inc
262\} 262\}
263.SH "SEE ALSO" 263.SH "SEE ALSO"
diff --git a/src/binlog.c b/src/binlog.c
index b2d581c..8263c12 100644
--- a/src/binlog.c
+++ b/src/binlog.c
@@ -1,5 +1,5 @@
1/* This file is part of vmod-binlog 1/* This file is part of vmod-binlog
2 Copyright (C) 2013, 2014, 2016, 2017 Sergey Poznyakoff 2 Copyright (C) 2013-2018 Sergey Poznyakoff
3 3
4 Vmod-binlog is free software; you can redistribute it and/or modify 4 Vmod-binlog is free software; you can redistribute it and/or modify
5 it under the terms of the GNU General Public License as published by 5 it under the terms of the GNU General Public License as published by
@@ -27,11 +27,17 @@
27#include <stdarg.h> 27#include <stdarg.h>
28#include <ctype.h> 28#include <ctype.h>
29#include <time.h> 29#include <time.h>
30#include "vcl.h" 30#include <string.h>
31#include "vrt.h" 31#if VARNISHAPI_MAJOR > 5
32#include "vcc_if.h" 32# include "cache/cache.h"
33 33# include "vcl.h"
34#include "cache/cache.h" 34# include "vcc_if.h"
35#else
36# include "vcl.h"
37# include "vrt.h"
38# include "vcc_if.h"
39# include "cache/cache.h"
40#endif
35#define WSPTR(s) ((s)->ws) 41#define WSPTR(s) ((s)->ws)
36 42
37#include "vmod-binlog.h" 43#include "vmod-binlog.h"

Return to:

Send suggestions and report system problems to the System administrator.