diff options
-rw-r--r-- | NEWS | 8 | ||||
-rw-r--r-- | README | 3 | ||||
m--------- | acvmod | 0 | ||||
-rw-r--r-- | configure.ac | 8 | ||||
-rw-r--r-- | src/vmod_dict.c | 18 |
5 files changed, 23 insertions, 14 deletions
@@ -1,9 +1,11 @@ | |||
1 | vmod_dict -- history of user-visible changes. 2017-08-10 | 1 | vmod_dict -- history of user-visible changes. 2018-12-10 |
2 | Copyright (C) 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_dict bug reports to <gray@gnu.org> | 4 | Please send vmod_dict bug reports to <gray@gnu.org> |
5 | |||
6 | Version 1.2, 2018-12-10 | ||
6 | 7 | ||
8 | * Support for Varnish 6.0.2 | ||
7 | 9 | ||
8 | Version 1.1, 2017-08-10 | 10 | Version 1.1, 2017-08-10 |
9 | 11 | ||
@@ -17,7 +19,7 @@ Initial release | |||
17 | ========================================================================= | 19 | ========================================================================= |
18 | Copyright information: | 20 | Copyright information: |
19 | 21 | ||
20 | Copyright (C) 2017 Sergey Poznyakoff | 22 | Copyright (C) 2017-2018 Sergey Poznyakoff |
21 | 23 | ||
22 | Permission is granted to anyone to make or distribute verbatim copies | 24 | Permission is granted to anyone to make or distribute verbatim copies |
23 | of this document as received, in any medium, provided that the | 25 | of this document as received, in any medium, provided that the |
@@ -1,5 +1,4 @@ | |||
1 | Vmod_dict README | 1 | Vmod_dict README |
2 | Copyright (C) 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 |
@@ -42,7 +41,7 @@ as follows: | |||
42 | 41 | ||
43 | In order to compile the package you need to have installed | 42 | In order to compile the package you need to have installed |
44 | varnishd and varnishapi package. The module has been tested with | 43 | varnishd and varnishapi package. The module has been tested with |
45 | Varnish versions 4.1 and 5.1. | 44 | Varnish versions 4.1, 5.1, and 6.0.2. |
46 | 45 | ||
47 | Supposing that condition is met, run: | 46 | Supposing that condition is met, run: |
48 | 47 | ||
diff --git a/acvmod b/acvmod | |||
Subproject 5f6dce2f7dd35a154333bb42d134a018b981f81 | Subproject 5b214e3d72f9e261a37cf31deb41e7f8a61a181 | ||
diff --git a/configure.ac b/configure.ac index 5d50849..1054289 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,5 +1,5 @@ | |||
1 | # This file is part of vmod_dict. | 1 | # This file is part of vmod_dict. |
2 | # Copyright (C) 2017 Sergey Poznyakoff | 2 | # Copyright (C) 2017-2018 Sergey Poznyakoff |
3 | # | 3 | # |
4 | # Vmod_dict is free software; you can redistribute it and/or modify | 4 | # Vmod_dict 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 |
@@ -15,7 +15,7 @@ | |||
15 | # along with vmod_dict. If not, see <http://www.gnu.org/licenses/>. | 15 | # along with vmod_dict. If not, see <http://www.gnu.org/licenses/>. |
16 | 16 | ||
17 | AC_PREREQ(2.69) | 17 | AC_PREREQ(2.69) |
18 | AC_INIT([vmod-dict], [1.1], [gray@gnu.org]) | 18 | AC_INIT([vmod-dict], [1.2], [gray@gnu.org]) |
19 | AC_CONFIG_AUX_DIR([build-aux]) | 19 | AC_CONFIG_AUX_DIR([build-aux]) |
20 | AC_CONFIG_MACRO_DIR([m4]) | 20 | AC_CONFIG_MACRO_DIR([m4]) |
21 | AC_CONFIG_SRCDIR(src/vmod_dict.vcc) | 21 | AC_CONFIG_SRCDIR(src/vmod_dict.vcc) |
@@ -45,7 +45,9 @@ AC_HEADER_STDC | |||
45 | 45 | ||
46 | # Check for functions | 46 | # Check for functions |
47 | 47 | ||
48 | AM_VARNISHAPI([4.1],[5.1]) | 48 | AM_VARNISHAPI([4.1],[6.0.9]) |
49 | AC_DEFINE_UNQUOTED([VARNISHAPI_MAJOR],[$VARNISHAPI_MAJOR], | ||
50 | [Varnish API major version number]) | ||
49 | 51 | ||
50 | AC_CONFIG_TESTDIR(tests) | 52 | AC_CONFIG_TESTDIR(tests) |
51 | AC_CONFIG_FILES([tests/Makefile tests/atlocal]) | 53 | AC_CONFIG_FILES([tests/Makefile tests/atlocal]) |
diff --git a/src/vmod_dict.c b/src/vmod_dict.c index 04ee52c..f9114d1 100644 --- a/src/vmod_dict.c +++ b/src/vmod_dict.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* This file is part of vmod_dict. | 1 | /* This file is part of vmod_dict. |
2 | Copyright (C) 2017 Sergey Poznyakoff | 2 | Copyright (C) 2017-2018 Sergey Poznyakoff |
3 | 3 | ||
4 | Vmod_dict is free software; you can redistribute it and/or modify | 4 | Vmod_dict 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 |
@@ -22,11 +22,17 @@ | |||
22 | #include <limits.h> | 22 | #include <limits.h> |
23 | #include <ctype.h> | 23 | #include <ctype.h> |
24 | #include <syslog.h> | 24 | #include <syslog.h> |
25 | #include "vcl.h" | 25 | #if VARNISHAPI_MAJOR > 5 |
26 | #include "vrt.h" | 26 | # include <cache/cache.h> |
27 | #include "vas.h" | 27 | # include <vcl.h> |
28 | #include "cache/cache.h" | 28 | # include <vcc_if.h> |
29 | #include "vcc_if.h" | 29 | #else |
30 | # include <vcl.h> | ||
31 | # include <vrt.h> | ||
32 | # include <vcc_if.h> | ||
33 | # include <cache/cache.h> | ||
34 | #endif | ||
35 | #include <vas.h> | ||
30 | 36 | ||
31 | struct entry | 37 | struct entry |
32 | { | 38 | { |