aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org>2022-08-21 21:26:19 +0200
committerSergey Poznyakoff <gray@gnu.org>2022-08-21 21:26:19 +0200
commitd900b5b8450c679877b288017152c96509e3fe90 (patch)
tree3130d15eeea25e5b2cc61b9602f2603df17c4844
parentcb7d4b5a74312c38f9dc8d0d20bcbaf31ed5186b (diff)
downloadvmod-dbrw-master.tar.gz
vmod-dbrw-master.tar.bz2
Version 2.8: Support for Varnish 7.1HEADv2.8master
-rw-r--r--NEWS6
m---------acvmod0
-rw-r--r--configure.ac6
-rw-r--r--doc/vmod-dbrw.38
-rw-r--r--src/vmod_dbrw.c6
5 files changed, 17 insertions, 9 deletions
diff --git a/NEWS b/NEWS
index 6fc931b..b54fe82 100644
--- a/NEWS
+++ b/NEWS
@@ -1,11 +1,15 @@
-vmod-dbrw -- history of user-visible changes. 2020-04-09
+vmod-dbrw -- history of user-visible changes. 2022-08-21
See the end of file for copying conditions.
Please send vmod-dbrw bug reports to <gray@gnu.org>
+Version 2.8, 2022-08-21
+
+* Support for Varnish 7.1
+
Version 2.7, 2020-04-09
* Drop support for Varnish versions prior to 6.0
Version 2.6, 2020-03-03
diff --git a/acvmod b/acvmod
-Subproject 99b8dd21c7d1a91021b0a63c0d846ac35c4b009
+Subproject 0516e2461e8f2e3b33a7fffa13705cdb1de77c5
diff --git a/configure.ac b/configure.ac
index 944d934..470d09b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
# This file is part of vmod-dbrw -*- autoconf -*-
-# Copyright (C) 2013-2020 Sergey Poznyakoff
+# Copyright (C) 2013-2022 Sergey Poznyakoff
#
# Vmod-dbrw is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3, or (at your option)
# any later version.
#
@@ -11,13 +11,13 @@
# 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-dbrw. If not, see <http://www.gnu.org/licenses/>.
AC_PREREQ(2.69)
-AC_INIT([vmod-dbrw], 2.7, [gray@gnu.org])
+AC_INIT([vmod-dbrw], 2.8, [gray@gnu.org])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR(src/vmod_dbrw.vcc)
AM_CONFIG_HEADER(config.h)
AC_SUBST([AC_VMOD_BASENAME],[dbrw])
@@ -40,13 +40,13 @@ AC_PROG_LIBTOOL
AC_PROG_MAKE_SET
# Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS([sys/stdlib.h])
-AM_VARNISHAPI([6.0],[6.4.0])
+AM_VARNISHAPI([6.0],[7.1.0])
AC_DEFINE_UNQUOTED([VARNISHAPI_MAJOR],[$VARNISHAPI_MAJOR],
[Varnish API major version number])
###########
# Check for SQL support
build_mysql=probe
diff --git a/doc/vmod-dbrw.3 b/doc/vmod-dbrw.3
index 26422f1..023e215 100644
--- a/doc/vmod-dbrw.3
+++ b/doc/vmod-dbrw.3
@@ -1,8 +1,8 @@
.\" This file is part of Vmod-dbrw -*- nroff -*-
-.\" Copyright (C) 2013-2020 Sergey Poznyakoff
+.\" Copyright (C) 2013-2022 Sergey Poznyakoff
.\"
.\" Vmod-dbrw is free software; you can redistribute it and/or modify
.\" it under the terms of the GNU General Public License as published by
.\" the Free Software Foundation; either version 3, or (at your option)
.\" any later version.
.\"
@@ -10,13 +10,13 @@
.\" 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-dbrw. If not, see <http://www.gnu.org/licenses/>.
-.TH VMOD-DBRW 3 "April 9, 2020" "VMOD-DBRW" "User Reference"
+.TH VMOD-DBRW 3 "August 21, 2022" "VMOD-DBRW" "User Reference"
.SH NAME
vmod-dbrw \- Database-driven rewrite rules for Varnish Cache
.SH SYNOPSIS
.B import dbrw;
.PP
.BI "VOID dbrw.config(STRING " dbtype ", STRING " params ", STRING " query ");"
@@ -315,13 +315,13 @@ sub vcl_synth {
.EE
.\" The MANCGI variable is set by man.cgi script on Ulysses.
.\" The download.inc file contains the default DOWNLOAD section
.\" for man-based doc pages.
.if "\V[MANCGI]"WEBDOC" \{\
. ds package vmod-dbrw
-. ds version 2.7
+. ds version 2.8
. so download.inc
\}
.SH "SEE ALSO"
.BR vcl (7),
.BR varnishd (1).
.PP
@@ -351,13 +351,13 @@ should give you access to the complete manual.
\}
.SH AUTHORS
Sergey Poznyakoff
.SH "BUG REPORTS"
Report bugs to <gray@gnu.org>.
.SH COPYRIGHT
-Copyright \(co 2013-2020 Sergey Poznyakoff
+Copyright \(co 2013-2022 Sergey Poznyakoff
.br
.na
License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
.br
.ad
This is free software: you are free to change and redistribute it.
diff --git a/src/vmod_dbrw.c b/src/vmod_dbrw.c
index 3509d04..f6b6446 100644
--- a/src/vmod_dbrw.c
+++ b/src/vmod_dbrw.c
@@ -1,8 +1,8 @@
/* This file is part of vmod-dbrw
- Copyright (C) 2013-2020 Sergey Poznyakoff
+ Copyright (C) 2013-2022 Sergey Poznyakoff
Vmod-dbrw is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
any later version.
@@ -377,12 +377,16 @@ expand_backref(VRT_CTX, const char *str, const char *val,
return b;
}
#define ISEMPTY(s) ((s) == NULL || (s)[0] == 0)
+#if VARNISHAPI_MAJOR > 6
+# define vrt_magic_string_end 0
+#endif
+
static void
dbrw_sethdr(VRT_CTX, int where, const char *what, const char *value)
{
struct gethdr_s s = { where, what };
VRT_SetHdr(ctx, &s, value, vrt_magic_string_end);
}

Return to:

Send suggestions and report system problems to the System administrator.