diff options
author | Sergey Poznyakoff <gray@gnu.org> | 2018-12-10 13:34:26 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org> | 2018-12-10 13:35:46 +0200 |
commit | 64853618b1c0ae890772aaad3ef75ffe6fdce67a (patch) | |
tree | f3f270896ae5652d357c209331459cb9bb97b12c | |
parent | ab8851545baad4d84dd7f42336dd3de9accdba5f (diff) | |
download | vmod-binlog-64853618b1c0ae890772aaad3ef75ffe6fdce67a.tar.gz vmod-binlog-64853618b1c0ae890772aaad3ef75ffe6fdce67a.tar.bz2 |
Version 2.3
Support for Varnish API 6.0.2
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | NEWS | 10 | ||||
-rw-r--r-- | README | 5 | ||||
m--------- | acvmod | 0 | ||||
-rw-r--r-- | configure.ac | 9 | ||||
-rw-r--r-- | doc/vmod-binlog.3 | 6 | ||||
-rw-r--r-- | src/binlog.c | 18 |
7 files changed, 30 insertions, 19 deletions
@@ -25,2 +25,3 @@ configure | |||
25 | core | 25 | core |
26 | libltdl | ||
26 | libtool | 27 | libtool |
@@ -1,3 +1,2 @@ | |||
1 | Vmod-binlog NEWS -- history of user-visible changes. 2017-08-10 | 1 | Vmod-binlog NEWS -- history of user-visible changes. 2018-12-10 |
2 | Copyright (C) 2013-2017 Sergey Poznyakoff | ||
3 | See the end of file for copying conditions. | 2 | See the end of file for copying conditions. |
@@ -6,2 +5,7 @@ Please send Vmod-binlog bug reports to <gray@gnu.org> | |||
6 | 5 | ||
6 | Version 2.3, 2018-12-10 | ||
7 | |||
8 | * Support for Varnish 6.0.2 | ||
9 | |||
10 | |||
7 | Version 2.2, 2017-08-10 | 11 | Version 2.2, 2017-08-10 |
@@ -33,3 +37,3 @@ Initial release. | |||
33 | 37 | ||
34 | Copyright (C) 2013-2017 Sergey Poznyakoff | 38 | Copyright (C) 2013-2018 Sergey Poznyakoff |
35 | 39 | ||
@@ -1,3 +1,2 @@ | |||
1 | Vmod-binlog README | 1 | Vmod-binlog README |
2 | Copyright (C) 2013-2017 Sergey Poznyakoff | ||
3 | See the end of file for copying conditions. | 2 | See the end of file for copying conditions. |
@@ -25,3 +24,3 @@ and searching in binary log files. | |||
25 | 24 | ||
26 | The module was tested with Varnish versions 4.1, and 5.1. | 25 | The module was tested with Varnish versions 4.1 through 6.0.2. |
27 | 26 | ||
@@ -94,3 +93,3 @@ Send bug reports and suggestions to <gray@gnu.org> | |||
94 | 93 | ||
95 | Copyright (C) 2013-2017 Sergey Poznyakoff | 94 | Copyright (C) 2013-2018 Sergey Poznyakoff |
96 | 95 | ||
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 @@ | |||
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 | # |
@@ -16,3 +16,3 @@ | |||
16 | AC_PREREQ(2.69) | 16 | AC_PREREQ(2.69) |
17 | AC_INIT([vmod-binlog], 2.2, [gray@gnu.org]) | 17 | AC_INIT([vmod-binlog], 2.3, [gray@gnu.org]) |
18 | AC_CONFIG_AUX_DIR([build-aux]) | 18 | AC_CONFIG_AUX_DIR([build-aux]) |
@@ -54,4 +54,5 @@ AC_CHECK_HEADERS([sys/stdlib.h]) | |||
54 | 54 | ||
55 | AM_VARNISHAPI([4.1],[5.1]) | 55 | AM_VARNISHAPI([4.1],[6.0.2]) |
56 | 56 | AC_DEFINE_UNQUOTED([VARNISHAPI_MAJOR],[$VARNISHAPI_MAJOR], | |
57 | [Varnish API major version number]) | ||
57 | AC_SUBST(BINLOGSEL_MODDIR,'$(libdir)/$(PACKAGE)') | 58 | 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 @@ | |||
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 | .\" |
@@ -15,3 +15,3 @@ | |||
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 |
@@ -259,3 +259,3 @@ the repeat count. | |||
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 |
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 @@ | |||
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 | ||
@@ -29,7 +29,13 @@ | |||
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) |