diff options
-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 | 10 |
7 files changed, 26 insertions, 15 deletions
@@ -23,6 +23,7 @@ config.log | |||
23 | config.status | 23 | config.status |
24 | configure | 24 | configure |
25 | core | 25 | core |
26 | libltdl | ||
26 | libtool | 27 | libtool |
27 | m4 | 28 | m4 |
28 | stamp-h1 | 29 | stamp-h1 |
@@ -1,9 +1,13 @@ | |||
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. |
4 | 3 | ||
5 | Please send Vmod-binlog bug reports to <gray@gnu.org> | 4 | 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 |
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 | ||
34 | Copyright (C) 2013-2017 Sergey Poznyakoff | 38 | Copyright (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 |
@@ -1,5 +1,4 @@ | |||
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. |
4 | 3 | ||
5 | * Introduction | 4 | * Introduction |
@@ -23,7 +22,7 @@ big amounts of information arriving at high rates. | |||
23 | The package provides the module itself and the utilities for listing | 22 | The package provides the module itself and the utilities for listing |
24 | and searching in binary log files. | 23 | 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 | ||
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 | ||
95 | Copyright (C) 2013-2017 Sergey Poznyakoff | 94 | Copyright (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/>. |
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]) |
19 | AC_CONFIG_MACRO_DIR([m4]) | 19 | AC_CONFIG_MACRO_DIR([m4]) |
20 | AC_CONFIG_SRCDIR(src/binlog.c) | 20 | AC_CONFIG_SRCDIR(src/binlog.c) |
@@ -52,8 +52,9 @@ AC_SYS_LARGEFILE | |||
52 | AC_HEADER_STDC | 52 | AC_HEADER_STDC |
53 | AC_CHECK_HEADERS([sys/stdlib.h]) | 53 | 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)') |
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 |
18 | vmod\-binlog \- binary log file support for Varnish Cache. | 18 | vmod\-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 <string.h> | ||
31 | #if VARNISHAPI_MAJOR > 5 | ||
32 | # include "cache/cache.h" | ||
33 | # include "vcl.h" | ||
34 | # include "vcc_if.h" | ||
35 | #else | ||
30 | # include "vcl.h" | 36 | # include "vcl.h" |
31 | # include "vrt.h" | 37 | # include "vrt.h" |
32 | # include "vcc_if.h" | 38 | # include "vcc_if.h" |
33 | |||
34 | # include "cache/cache.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" |