summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org>2018-12-10 12:58:45 (GMT)
committer Sergey Poznyakoff <gray@gnu.org>2018-12-10 12:58:45 (GMT)
commit0bf07eac5b81f040a18b9c2071f8b7e6fd06fe44 (patch) (unidiff)
tree613bd865c8185a26c1723dd6d1879af5e3c2dd1a
parentc8cee8164cf638da3851a2c56a844e5ff3609eb0 (diff)
downloadvmod-variable-0bf07eac5b81f040a18b9c2071f8b7e6fd06fe44.tar.gz
vmod-variable-0bf07eac5b81f040a18b9c2071f8b7e6fd06fe44.tar.bz2
Version 1.3 (supports Varnish 6.0.2)HEADrelease-1.3master
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--NEWS9
-rw-r--r--README16
m---------acvmod0
-rw-r--r--configure.ac8
-rw-r--r--src/variable.c20
-rw-r--r--src/vmod-variable.38
6 files changed, 43 insertions, 18 deletions
diff --git a/NEWS b/NEWS
index f2fbb38..275afd8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,12 @@
1vmod-variable -- history of user-visible changes. 2017-08-10 1vmod-variable -- history of user-visible changes. 2018-12-10
2Copyright (C) 2015-2017 Sergey Poznyakoff
3See the end of file for copying conditions. 2See the end of file for copying conditions.
4 3
5Please send vmod-variable bug reports to <gray@gnu.org> 4Please send vmod-variable bug reports to <gray@gnu.org>
6 5
6Version 1.3, 2018-12-10
7
8* Support for Varnish 6.0.2
9
7Version 1.2, 2017-08-10 10Version 1.2, 2017-08-10
8 11
9* Support for Varnish 5.1 12* Support for Varnish 5.1
@@ -26,7 +29,7 @@ Initial release
26========================================================================= 29=========================================================================
27Copyright information: 30Copyright information:
28 31
29Copyright (C) 2015-2017 Sergey Poznyakoff 32Copyright (C) 2015-2018 Sergey Poznyakoff
30 33
31 Permission is granted to anyone to make or distribute verbatim copies 34 Permission is granted to anyone to make or distribute verbatim copies
32 of this document as received, in any medium, provided that the 35 of this document as received, in any medium, provided that the
diff --git a/README b/README
index 05510c6..372fb2c 100644
--- a/README
+++ b/README
@@ -1,5 +1,4 @@
1Vmod-variable README 1Vmod-variable README
2Copyright (C) 2015 Sergey Poznyakoff
3See the end of file for copying conditions. 2See the end of file for copying conditions.
4 3
5* Introduction 4* Introduction
@@ -16,7 +15,7 @@ the section "vmod_variable vs. vmod_var".
16* Overview 15* Overview
17 16
18This module provides enhanced variable support for VCL scripts. 17This module provides enhanced variable support for VCL scripts.
19It compiles for Varnish versions 3 and 4. 18It compiles for Varnish versions from 4.1 to 6.0.2.
20 19
21There are two kinds of variables: session-specific, which have the 20There are two kinds of variables: session-specific, which have the
22lifespan of one HTTP session (connection) and cease to exist when 21lifespan of one HTTP session (connection) and cease to exist when
@@ -219,7 +218,20 @@ http://www.gnu.org.ua/software/vmod-variable.
219* Bug reporting 218* Bug reporting
220 219
221Send bug reports and suggestions to <gray@gnu.org> 220Send bug reports and suggestions to <gray@gnu.org>
221
222* Copyright information:
223
224Copyright (C) 2013-2018 Sergey Poznyakoff
225
226 Permission is granted to anyone to make or distribute verbatim copies
227 of this document as received, in any medium, provided that the
228 copyright notice and this permission notice are preserved,
229 thus giving the recipient permission to redistribute in turn.
222 230
231 Permission is granted to distribute modified versions
232 of this document, or of portions of it,
233 under the above conditions, provided also that they
234 carry prominent notices stating who last changed them.
223 235
224Local Variables: 236Local Variables:
225mode: outline 237mode: outline
diff --git a/acvmod b/acvmod
Subproject 5f6dce2f7dd35a154333bb42d134a018b981f81 Subproject 5b214e3d72f9e261a37cf31deb41e7f8a61a181
diff --git a/configure.ac b/configure.ac
index e80461a..48c7a2f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
1# This file is part of vmod-variable -*- autoconf -*- 1# This file is part of vmod-variable -*- autoconf -*-
2# Copyright (C) 2015-2017 Sergey Poznyakoff 2# Copyright (C) 2015-2018 Sergey Poznyakoff
3# 3#
4# Vmod-variable is free software; you can redistribute it and/or modify 4# Vmod-variable 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
@@ -14,7 +14,7 @@
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-variable. If not, see <http://www.gnu.org/licenses/>. 15# along with vmod-variable. If not, see <http://www.gnu.org/licenses/>.
16AC_PREREQ(2.69) 16AC_PREREQ(2.69)
17AC_INIT([vmod-variable], [1.2], [gray@gnu.org]) 17AC_INIT([vmod-variable], [1.3], [gray@gnu.org])
18AC_CONFIG_AUX_DIR([build-aux]) 18AC_CONFIG_AUX_DIR([build-aux])
19AC_CONFIG_MACRO_DIR([m4]) 19AC_CONFIG_MACRO_DIR([m4])
20AC_CONFIG_SRCDIR(src/variable.vcc) 20AC_CONFIG_SRCDIR(src/variable.vcc)
@@ -50,7 +50,9 @@ AC_CHECK_FUNCS(sysinfo getloadavg)
50AC_CHECK_LIB(pcre, pcre_compile,, 50AC_CHECK_LIB(pcre, pcre_compile,,
51 AC_MSG_ERROR([required library libpcre not found])) 51 AC_MSG_ERROR([required library libpcre not found]))
52 52
53AM_VARNISHAPI([4.1],[5.1]) 53AM_VARNISHAPI([4.1],[6.0.2])
54AC_DEFINE_UNQUOTED([VARNISHAPI_MAJOR],[$VARNISHAPI_MAJOR],
55 [Varnish API major version number])
54 56
55AC_CONFIG_TESTDIR(tests) 57AC_CONFIG_TESTDIR(tests)
56AC_CONFIG_FILES([tests/Makefile tests/atlocal]) 58AC_CONFIG_FILES([tests/Makefile tests/atlocal])
diff --git a/src/variable.c b/src/variable.c
index feaaa21..b8905be 100644
--- a/src/variable.c
+++ b/src/variable.c
@@ -1,5 +1,5 @@
1/* This file is part of vmod-variable 1/* This file is part of vmod-variable
2 Copyright (C) 2013-2017 Sergey Poznyakoff 2 Copyright (C) 2013-2018 Sergey Poznyakoff
3 3
4 Vmod-variable is free software; you can redistribute it and/or modify 4 Vmod-variable 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
@@ -19,13 +19,21 @@
19#include <stdarg.h> 19#include <stdarg.h>
20#include <syslog.h> 20#include <syslog.h>
21#include <errno.h> 21#include <errno.h>
22#include <string.h>
22#include <ctype.h> 23#include <ctype.h>
23#include <pcre.h> 24#include <pcre.h>
24#include "vrt.h" 25#include <pthread.h>
25#include "vcc_if.h" 26#include <limits.h>
26#include "pthread.h" 27#if VARNISHAPI_MAJOR > 5
27#include "cache/cache.h" 28# include "cache/cache.h"
28 29# include "vcl.h"
30# include "vcc_if.h"
31#else
32# include "vcl.h"
33# include "vrt.h"
34# include "vcc_if.h"
35# include "cache/cache.h"
36#endif
29#define WSPTR(s) ((s)->ws) 37#define WSPTR(s) ((s)->ws)
30 38
31/* |hash_size| defines a sequence of symbol table sizes. These are prime 39/* |hash_size| defines a sequence of symbol table sizes. These are prime
diff --git a/src/vmod-variable.3 b/src/vmod-variable.3
index f249ad3..b74e069 100644
--- a/src/vmod-variable.3
+++ b/src/vmod-variable.3
@@ -1,5 +1,5 @@
1.\" This file is part of Vmod-variable -*- nroff -*- 1.\" This file is part of Vmod-variable -*- nroff -*-
2.\" Copyright (C) 2015 Sergey Poznyakoff 2.\" Copyright (C) 2015-2018 Sergey Poznyakoff
3.\" 3.\"
4.\" Vmod-variable is free software; you can redistribute it and/or modify 4.\" Vmod-variable 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
@@ -13,7 +13,7 @@
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-variable. If not, see <http://www.gnu.org/licenses/>. 15.\" along with vmod-variable. If not, see <http://www.gnu.org/licenses/>.
16.TH VMOD-VARIABLE 1 "February 16, 2015" "VMOD-VARIABLE" "User Reference" 16.TH VMOD-VARIABLE 3 "December 10, 2018" "VMOD-VARIABLE" "User Reference"
17.SH NAME 17.SH NAME
18vmod-variable \- variable support for Varnish Cache 18vmod-variable \- variable support for Varnish Cache
19.SH SYNOPSIS 19.SH SYNOPSIS
@@ -221,7 +221,7 @@ if (req.request == "GET") {
221.\" for man-based doc pages. 221.\" for man-based doc pages.
222.if "\V[MANCGI]"WEBDOC" \{\ 222.if "\V[MANCGI]"WEBDOC" \{\
223 .ds package vmod-variable 223 .ds package vmod-variable
224 .ds version 1.0 224 .ds version 1.3
225 .so download.inc 225 .so download.inc
226\} 226\}
227.SH "SEE ALSO" 227.SH "SEE ALSO"
@@ -232,7 +232,7 @@ Sergey Poznyakoff
232.SH "BUG REPORTS" 232.SH "BUG REPORTS"
233Report bugs to <gray@gnu.org>. 233Report bugs to <gray@gnu.org>.
234.SH COPYRIGHT 234.SH COPYRIGHT
235Copyright \(co 2015 Sergey Poznyakoff 235Copyright \(co 2015-2018 Sergey Poznyakoff
236.br 236.br
237.na 237.na
238License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> 238License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>

Return to:

Send suggestions and report system problems to the System administrator.