aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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,17 +1,22 @@
-vmod_dict -- history of user-visible changes. 2020-03-03
+vmod_dict -- history of user-visible changes. 2020-03-27
See the end of file for copying conditions.
Please send vmod_dict bug reports to <gray@gnu.org>
+Version 1.3.90 (git)
+
+* Drop support for Varnish versions prior to 6.0.0
+
+
Version 1.3, 2020-03-03
* Support for Varnish 6.3.1
Version 1.2, 2018-12-10
* Support for Varnish 6.0.2
Version 1.1, 2017-08-10
* Support for Varnish 5.1
diff --git a/README b/README
index 7c4a5c5..3affbfc 100644
--- a/README
+++ b/README
@@ -28,29 +28,30 @@ function. Normally it is done in vcl_init:
}
The second argument (a boolean) specifies whether the keyword matching
is case-insensitive (true) or case-sensitive (false). The 3rd argument
gives the maximum allowed number of collisions in the loaded hash
table. The module will adjust the load factor to meet this number.
Once loaded, the value corresponding to a given key can be retrieved
as follows:
set req.http.X-Value = dict.lookup("key");
+The module has been tested with Varnish versions 6.0.2 -- 6.3.2.
+
* Installation
In order to compile the package you need to have installed
-varnishd and varnishapi package. The module has been tested with
-Varnish versions 4.1, 5.1, and 6.0.2.
+varnishd and varnishapi package.
Supposing that condition is met, run:
./configure
It should be able to automatically find the necessary components. In case
it doesn't, tweak the configuration variables as necessary. The most
important one is PKG_CONFIG_PATH, which contains a path (in the UNIX sense)
where the .pc files are located. It should contain a directory where the
'varnishapi.pc' file lives. Example usage:
./configure PKG_CONFIG_PATH=/usr/local/varnish/lib/pkgconfig:$PKG_CONFIG_PATH
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
@@ -6,25 +6,25 @@
# the Free Software Foundation; either version 3, or (at your option)
# any later version.
#
# Vmod_dict is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with vmod_dict. If not, see <http://www.gnu.org/licenses/>.
AC_PREREQ(2.69)
-AC_INIT([vmod-dict], [1.3], [gray@gnu.org])
+AC_INIT([vmod-dict], [1.3.90], [gray@gnu.org])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR(src/vmod_dict.vcc)
AM_CONFIG_HEADER(config.h)
AC_SUBST([AC_VMOD_BASENAME],[dict])
AC_CANONICAL_SYSTEM
AC_LANG(C)
AM_INIT_AUTOMAKE([1.14 gnu tar-ustar silent-rules])
AM_SILENT_RULES([yes])
@@ -36,25 +36,25 @@ if test "x$ac_cv_prog_cc_c99" = xno; then
fi
AC_PROG_CPP
AC_PROG_INSTALL
AC_PROG_LIBTOOL
AC_PROG_MAKE_SET
# Checks for header files.
AC_HEADER_STDC
# Check for functions
-AM_VARNISHAPI([4.1],[6.3.2])
+AM_VARNISHAPI([6.0.0],[6.3.2])
AC_DEFINE_UNQUOTED([VARNISHAPI_MAJOR],[$VARNISHAPI_MAJOR],
[Varnish API major version number])
AC_CONFIG_TESTDIR(tests)
AC_CONFIG_FILES([tests/Makefile tests/atlocal])
AM_MISSING_PROG([AUTOM4TE], [autom4te])
AC_CONFIG_FILES([
Makefile
src/Makefile
])
AC_OUTPUT
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
@@ -13,34 +13,27 @@
You should have received a copy of the GNU General Public License
along with vmod_dict. If not, see <http://www.gnu.org/licenses/>.
*/
#include <config.h>
#include <stdlib.h>
#include <stdio.h>
#include <errno.h>
#include <string.h>
#include <limits.h>
#include <ctype.h>
#include <syslog.h>
-#if VARNISHAPI_MAJOR > 5
-# include <cache/cache.h>
-# include <vcl.h>
-# include <vcc_if.h>
-#else
-# include <vcl.h>
-# include <vrt.h>
-# include <vcc_if.h>
-# include <cache/cache.h>
-#endif
+#include <cache/cache.h>
+#include <vcl.h>
+#include <vcc_if.h>
#ifdef VPFX
# define VEVENT(a) VPFX(a)
#else
/* For compatibility with varnish prior to 6.2 */
# define VEVENT(a) a
#endif
#include <vas.h>
struct entry
{

Return to:

Send suggestions and report system problems to the System administrator.