summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org>2020-03-27 09:36:30 (GMT)
committer Sergey Poznyakoff <gray@gnu.org>2020-03-27 09:36:30 (GMT)
commit4564b6c9776eecfece2eb097ebe5aebfd79c9cb8 (patch) (unidiff)
tree12aaa33b46c9f8c85d8b5897079f21ea15ede0fc
parent87ff2f5ebb147d6800b838d8e9dd6063305ddd47 (diff)
downloadvmod-dict-4564b6c9776eecfece2eb097ebe5aebfd79c9cb8.tar.gz
vmod-dict-4564b6c9776eecfece2eb097ebe5aebfd79c9cb8.tar.bz2
Drop support for Varnish versions prior to 6.0
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--NEWS7
-rw-r--r--README5
m---------acvmod0
-rw-r--r--configure.ac4
-rw-r--r--src/vmod_dict.c13
5 files changed, 14 insertions, 15 deletions
diff --git a/NEWS b/NEWS
index a28b8f9..bc30866 100644
--- a/NEWS
+++ b/NEWS
@@ -1,11 +1,16 @@
1vmod_dict -- history of user-visible changes. 2020-03-03 1vmod_dict -- history of user-visible changes. 2020-03-27
2See the end of file for copying conditions. 2See the end of file for copying conditions.
3 3
4Please send vmod_dict bug reports to <gray@gnu.org> 4Please send vmod_dict bug reports to <gray@gnu.org>
5 5
6Version 1.3.90 (git)
7
8* Drop support for Varnish versions prior to 6.0.0
9
10
6Version 1.3, 2020-03-03 11Version 1.3, 2020-03-03
7 12
8* Support for Varnish 6.3.1 13* Support for Varnish 6.3.1
9 14
10 15
11Version 1.2, 2018-12-10 16Version 1.2, 2018-12-10
diff --git a/README b/README
index 7c4a5c5..3affbfc 100644
--- a/README
+++ b/README
@@ -34,17 +34,18 @@ table. The module will adjust the load factor to meet this number.
34 34
35Once loaded, the value corresponding to a given key can be retrieved 35Once loaded, the value corresponding to a given key can be retrieved
36as follows: 36as follows:
37 37
38 set req.http.X-Value = dict.lookup("key"); 38 set req.http.X-Value = dict.lookup("key");
39 39
40The module has been tested with Varnish versions 6.0.2 -- 6.3.2.
41
40* Installation 42* Installation
41 43
42In order to compile the package you need to have installed 44In order to compile the package you need to have installed
43varnishd and varnishapi package. The module has been tested with 45varnishd and varnishapi package.
44Varnish versions 4.1, 5.1, and 6.0.2.
45 46
46Supposing that condition is met, run: 47Supposing that condition is met, run:
47 48
48 ./configure 49 ./configure
49 50
50It should be able to automatically find the necessary components. In case 51It should be able to automatically find the necessary components. In case
diff --git a/acvmod b/acvmod
Subproject 5b214e3d72f9e261a37cf31deb41e7f8a61a181 Subproject 99b8dd21c7d1a91021b0a63c0d846ac35c4b009
diff --git a/configure.ac b/configure.ac
index c37cc81..0dc3f0b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
17AC_PREREQ(2.69) 17AC_PREREQ(2.69)
18AC_INIT([vmod-dict], [1.3], [gray@gnu.org]) 18AC_INIT([vmod-dict], [1.3.90], [gray@gnu.org])
19AC_CONFIG_AUX_DIR([build-aux]) 19AC_CONFIG_AUX_DIR([build-aux])
20AC_CONFIG_MACRO_DIR([m4]) 20AC_CONFIG_MACRO_DIR([m4])
21AC_CONFIG_SRCDIR(src/vmod_dict.vcc) 21AC_CONFIG_SRCDIR(src/vmod_dict.vcc)
22AM_CONFIG_HEADER(config.h) 22AM_CONFIG_HEADER(config.h)
23 23
24AC_SUBST([AC_VMOD_BASENAME],[dict]) 24AC_SUBST([AC_VMOD_BASENAME],[dict])
@@ -42,13 +42,13 @@ AC_PROG_MAKE_SET
42 42
43# Checks for header files. 43# Checks for header files.
44AC_HEADER_STDC 44AC_HEADER_STDC
45 45
46# Check for functions 46# Check for functions
47 47
48AM_VARNISHAPI([4.1],[6.3.2]) 48AM_VARNISHAPI([6.0.0],[6.3.2])
49AC_DEFINE_UNQUOTED([VARNISHAPI_MAJOR],[$VARNISHAPI_MAJOR], 49AC_DEFINE_UNQUOTED([VARNISHAPI_MAJOR],[$VARNISHAPI_MAJOR],
50 [Varnish API major version number]) 50 [Varnish API major version number])
51 51
52AC_CONFIG_TESTDIR(tests) 52AC_CONFIG_TESTDIR(tests)
53AC_CONFIG_FILES([tests/Makefile tests/atlocal]) 53AC_CONFIG_FILES([tests/Makefile tests/atlocal])
54AM_MISSING_PROG([AUTOM4TE], [autom4te]) 54AM_MISSING_PROG([AUTOM4TE], [autom4te])
diff --git a/src/vmod_dict.c b/src/vmod_dict.c
index 8c1e230..3163657 100644
--- a/src/vmod_dict.c
+++ b/src/vmod_dict.c
@@ -19,22 +19,15 @@
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#if VARNISHAPI_MAJOR > 5 25#include <cache/cache.h>
26# include <cache/cache.h> 26#include <vcl.h>
27# include <vcl.h> 27#include <vcc_if.h>
28# 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 28
36#ifdef VPFX 29#ifdef VPFX
37# define VEVENT(a) VPFX(a) 30# define VEVENT(a) VPFX(a)
38#else 31#else
39/* For compatibility with varnish prior to 6.2 */ 32/* For compatibility with varnish prior to 6.2 */
40# define VEVENT(a) a 33# define VEVENT(a) a

Return to:

Send suggestions and report system problems to the System administrator.