diff options
-rw-r--r-- | NEWS | 7 | ||||
-rw-r--r-- | README | 3 | ||||
m--------- | acvmod | 0 | ||||
-rw-r--r-- | configure.ac | 5 | ||||
-rw-r--r-- | tests/Makefile.am | 1 | ||||
-rw-r--r-- | tests/atlocal.in | 2 | ||||
-rw-r--r-- | tests/ci.at | 2 | ||||
-rw-r--r-- | tests/cs.at | 2 |
8 files changed, 15 insertions, 7 deletions
@@ -1,13 +1,18 @@ | |||
1 | vmod_dict -- history of user-visible changes. 2017-08-06 | 1 | vmod_dict -- history of user-visible changes. 2017-08-10 |
2 | Copyright (C) 2017 Sergey Poznyakoff | 2 | Copyright (C) 2017 Sergey Poznyakoff |
3 | See the end of file for copying conditions. | 3 | See the end of file for copying conditions. |
4 | 4 | ||
5 | Please send vmod_dict bug reports to <gray@gnu.org> | 5 | Please send vmod_dict bug reports to <gray@gnu.org> |
6 | 6 | ||
7 | 7 | ||
8 | Version 1.1, 2017-08-10 | ||
9 | |||
10 | * Support for Varnish 5.1 | ||
11 | |||
12 | |||
8 | Version 1.0, 2017-08-06 | 13 | Version 1.0, 2017-08-06 |
9 | 14 | ||
10 | Initial release | 15 | Initial release |
11 | 16 | ||
12 | ========================================================================= | 17 | ========================================================================= |
13 | Copyright information: | 18 | Copyright information: |
@@ -38,13 +38,14 @@ as follows: | |||
38 | 38 | ||
39 | set req.http.X-Value = dict.lookup("key"); | 39 | set req.http.X-Value = dict.lookup("key"); |
40 | 40 | ||
41 | * Installation | 41 | * Installation |
42 | 42 | ||
43 | In order to compile the package you need to have installed | 43 | In order to compile the package you need to have installed |
44 | varnishd and varnishapi package. | 44 | varnishd and varnishapi package. The module has been tested with |
45 | Varnish versions 4.1 and 5.1. | ||
45 | 46 | ||
46 | Supposing that condition is met, run: | 47 | Supposing that condition is met, run: |
47 | 48 | ||
48 | ./configure | 49 | ./configure |
49 | 50 | ||
50 | It should be able to automatically find the necessary components. In case | 51 | It should be able to automatically find the necessary components. In case |
diff --git a/acvmod b/acvmod | |||
Subproject ba32780019480b89cd9d796b93a76cae6afe99a | Subproject 5f6dce2f7dd35a154333bb42d134a018b981f81 | ||
diff --git a/configure.ac b/configure.ac index 30e9bc0..5d50849 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -12,18 +12,19 @@ | |||
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.0], [gray@gnu.org]) | 18 | AC_INIT([vmod-dict], [1.1], [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_CANONICAL_SYSTEM | 25 | AC_CANONICAL_SYSTEM |
25 | AC_LANG(C) | 26 | AC_LANG(C) |
26 | 27 | ||
27 | AM_INIT_AUTOMAKE([1.14 gnu tar-ustar silent-rules]) | 28 | AM_INIT_AUTOMAKE([1.14 gnu tar-ustar silent-rules]) |
28 | AM_SILENT_RULES([yes]) | 29 | AM_SILENT_RULES([yes]) |
29 | 30 | ||
@@ -41,13 +42,13 @@ AC_PROG_MAKE_SET | |||
41 | 42 | ||
42 | # Checks for header files. | 43 | # Checks for header files. |
43 | AC_HEADER_STDC | 44 | AC_HEADER_STDC |
44 | 45 | ||
45 | # Check for functions | 46 | # Check for functions |
46 | 47 | ||
47 | AM_VARNISHAPI([4.1]) | 48 | AM_VARNISHAPI([4.1],[5.1]) |
48 | 49 | ||
49 | AC_CONFIG_TESTDIR(tests) | 50 | AC_CONFIG_TESTDIR(tests) |
50 | AC_CONFIG_FILES([tests/Makefile tests/atlocal]) | 51 | AC_CONFIG_FILES([tests/Makefile tests/atlocal]) |
51 | AM_MISSING_PROG([AUTOM4TE], [autom4te]) | 52 | AM_MISSING_PROG([AUTOM4TE], [autom4te]) |
52 | 53 | ||
53 | AC_CONFIG_FILES([ | 54 | AC_CONFIG_FILES([ |
diff --git a/tests/Makefile.am b/tests/Makefile.am index d70517f..6c5967c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am | |||
@@ -28,12 +28,13 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac | |||
28 | echo '# Signature of the current package.'; \ | 28 | echo '# Signature of the current package.'; \ |
29 | echo 'm4_define([AT_PACKAGE_NAME], [@PACKAGE_NAME@])'; \ | 29 | echo 'm4_define([AT_PACKAGE_NAME], [@PACKAGE_NAME@])'; \ |
30 | echo 'm4_define([AT_PACKAGE_TARNAME], [@PACKAGE_TARNAME@])'; \ | 30 | echo 'm4_define([AT_PACKAGE_TARNAME], [@PACKAGE_TARNAME@])'; \ |
31 | echo 'm4_define([AT_PACKAGE_VERSION], [@PACKAGE_VERSION@])'; \ | 31 | echo 'm4_define([AT_PACKAGE_VERSION], [@PACKAGE_VERSION@])'; \ |
32 | echo 'm4_define([AT_PACKAGE_STRING], [@PACKAGE_STRING@])'; \ | 32 | echo 'm4_define([AT_PACKAGE_STRING], [@PACKAGE_STRING@])'; \ |
33 | echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \ | 33 | echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \ |
34 | echo 'm4_define([AT_VMOD_BASENAME], [@AC_VMOD_BASENAME@])'; \ | ||
34 | } >$(srcdir)/package.m4 | 35 | } >$(srcdir)/package.m4 |
35 | 36 | ||
36 | # | 37 | # |
37 | 38 | ||
38 | ## ------------ ## | 39 | ## ------------ ## |
39 | ## Test suite. ## | 40 | ## Test suite. ## |
diff --git a/tests/atlocal.in b/tests/atlocal.in index 142b9ed..5d6b7f3 100644 --- a/tests/atlocal.in +++ b/tests/atlocal.in | |||
@@ -1,7 +1,7 @@ | |||
1 | # @configure_input@ -*- shell-script -*- | 1 | # @configure_input@ -*- shell-script -*- |
2 | # Configurable variable values for vmod_dict test suite. | 2 | # Configurable variable values for vmod_dict test suite. |
3 | # Copyright (C) 2017 Sergey Poznyakoff | 3 | # Copyright (C) 2017 Sergey Poznyakoff |
4 | 4 | ||
5 | PATH=@abs_builddir@:@abs_top_builddir@/src:@abs_top_srcdir@/build-aux:$top_srcdir:$srcdir:$PATH | 5 | PATH=@abs_builddir@:@abs_top_builddir@/src:@abs_top_srcdir@/build-aux:$top_srcdir:$srcdir:@VARNISH_SBINDIR@:$PATH |
6 | VARNISHTEST=@VARNISHTEST@ | 6 | VARNISHTEST=@VARNISHTEST@ |
7 | VARNISHD=@VARNISHD@ | 7 | VARNISHD=@VARNISHD@ |
diff --git a/tests/ci.at b/tests/ci.at index d486188..1115316 100644 --- a/tests/ci.at +++ b/tests/ci.at | |||
@@ -1,9 +1,9 @@ | |||
1 | AT_SETUP([case-insensitive]) | 1 | AT_SETUP([case-insensitive]) |
2 | AT_KEYWORDS([case-insensitive]) | 2 | AT_KEYWORDS([case-insensitive]) |
3 | AT_VARNISHTEST([dict],[ | 3 | AT_VARNISHTEST([ |
4 | sub vcl_init { | 4 | sub vcl_init { |
5 | dict.ci(true); | 5 | dict.ci(true); |
6 | dict.collisions(0); | 6 | dict.collisions(0); |
7 | dict.load("\${vmod_topsrc}/tests/num.dict"); | 7 | dict.load("\${vmod_topsrc}/tests/num.dict"); |
8 | } | 8 | } |
9 | sub vcl_recv { | 9 | sub vcl_recv { |
diff --git a/tests/cs.at b/tests/cs.at index 0333943..11366c4 100644 --- a/tests/cs.at +++ b/tests/cs.at | |||
@@ -1,9 +1,9 @@ | |||
1 | AT_SETUP([case-sensitive]) | 1 | AT_SETUP([case-sensitive]) |
2 | AT_KEYWORDS([case-sensitive]) | 2 | AT_KEYWORDS([case-sensitive]) |
3 | AT_VARNISHTEST([dict],[ | 3 | AT_VARNISHTEST([ |
4 | sub vcl_init { | 4 | sub vcl_init { |
5 | dict.collisions(0); | 5 | dict.collisions(0); |
6 | dict.load("\${vmod_topsrc}/tests/num.dict"); | 6 | dict.load("\${vmod_topsrc}/tests/num.dict"); |
7 | } | 7 | } |
8 | sub vcl_recv { | 8 | sub vcl_recv { |
9 | set req.http.X-result = dict.lookup(regsub(req.url, "^/(.*)", "\1")); | 9 | set req.http.X-result = dict.lookup(regsub(req.url, "^/(.*)", "\1")); |