diff options
author | Sergey Poznyakoff <gray@gnu.org> | 2018-12-10 15:37:46 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org> | 2018-12-10 15:37:46 +0200 |
commit | 5b18b9c1e8d0e0ad14937669a931a1a358e65091 (patch) | |
tree | 155fad81320aa1d742513b4c64a7c024ed437b2e | |
parent | a29737fc04272ac38d639ac25841183db1052fbc (diff) | |
download | vmod-dict-5b18b9c1e8d0e0ad14937669a931a1a358e65091.tar.gz vmod-dict-5b18b9c1e8d0e0ad14937669a931a1a358e65091.tar.bz2 |
Version 1.2 (support for Varnish 6.0.2)release-1.2
-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,12 +1,14 @@ | |||
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 | ||
10 | * Support for Varnish 5.1 | 12 | * Support for Varnish 5.1 |
11 | 13 | ||
12 | 14 | ||
@@ -14,13 +16,13 @@ Version 1.0, 2017-08-06 | |||
14 | 16 | ||
15 | Initial release | 17 | Initial release |
16 | 18 | ||
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 |
24 | copyright notice and this permission notice are preserved, | 26 | copyright notice and this permission notice are preserved, |
25 | thus giving the recipient permission to redistribute in turn. | 27 | thus giving the recipient permission to redistribute in turn. |
26 | 28 | ||
@@ -1,8 +1,7 @@ | |||
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 |
6 | 5 | ||
7 | This file contains brief information about configuring, testing | 6 | This file contains brief information about configuring, testing |
8 | and using vmod_dict. It is *not* intended as a replacement | 7 | and using vmod_dict. It is *not* intended as a replacement |
@@ -39,13 +38,13 @@ as follows: | |||
39 | set req.http.X-Value = dict.lookup("key"); | 38 | set req.http.X-Value = dict.lookup("key"); |
40 | 39 | ||
41 | * Installation | 40 | * Installation |
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 | ||
49 | ./configure | 48 | ./configure |
50 | 49 | ||
51 | It should be able to automatically find the necessary components. In case | 50 | It should be able to automatically find the necessary components. In case |
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,8 +1,8 @@ | |||
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 |
6 | # the Free Software Foundation; either version 3, or (at your option) | 6 | # the Free Software Foundation; either version 3, or (at your option) |
7 | # any later version. | 7 | # any later version. |
8 | # | 8 | # |
@@ -12,13 +12,13 @@ | |||
12 | # GNU General Public License for more details. | 12 | # GNU General Public License for more details. |
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_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) |
22 | AM_CONFIG_HEADER(config.h) | 22 | AM_CONFIG_HEADER(config.h) |
23 | 23 | ||
24 | AC_SUBST([AC_VMOD_BASENAME],[dict]) | 24 | AC_SUBST([AC_VMOD_BASENAME],[dict]) |
@@ -42,13 +42,15 @@ AC_PROG_MAKE_SET | |||
42 | 42 | ||
43 | # Checks for header files. | 43 | # Checks for header files. |
44 | AC_HEADER_STDC | 44 | 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]) |
52 | AM_MISSING_PROG([AUTOM4TE], [autom4te]) | 54 | AM_MISSING_PROG([AUTOM4TE], [autom4te]) |
53 | 55 | ||
54 | AC_CONFIG_FILES([ | 56 | AC_CONFIG_FILES([ |
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,8 +1,8 @@ | |||
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 |
6 | the Free Software Foundation; either version 3, or (at your option) | 6 | the Free Software Foundation; either version 3, or (at your option) |
7 | any later version. | 7 | any later version. |
8 | 8 | ||
@@ -19,17 +19,23 @@ | |||
19 | #include <stdio.h> | 19 | #include <stdio.h> |
20 | #include <errno.h> | 20 | #include <errno.h> |
21 | #include <string.h> | 21 | #include <string.h> |
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 | { |
33 | char *key; | 39 | char *key; |
34 | char *val; | 40 | char *val; |
35 | size_t hash; | 41 | size_t hash; |