diff options
author | Sergey Poznyakoff <gray@gnu.org> | 2022-08-21 21:26:19 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org> | 2022-08-21 21:26:19 +0200 |
commit | d900b5b8450c679877b288017152c96509e3fe90 (patch) | |
tree | 3130d15eeea25e5b2cc61b9602f2603df17c4844 | |
parent | cb7d4b5a74312c38f9dc8d0d20bcbaf31ed5186b (diff) | |
download | vmod-dbrw-master.tar.gz vmod-dbrw-master.tar.bz2 |
-rw-r--r-- | NEWS | 6 | ||||
m--------- | acvmod | 0 | ||||
-rw-r--r-- | configure.ac | 6 | ||||
-rw-r--r-- | doc/vmod-dbrw.3 | 8 | ||||
-rw-r--r-- | src/vmod_dbrw.c | 6 |
5 files changed, 17 insertions, 9 deletions
@@ -1,17 +1,21 @@ -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 * Builds with Varnish 6.3.1 Version 2.5, 2019-02-15 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,29 +1,29 @@ # 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. # # Vmod-dbrw 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-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]) AC_CANONICAL_SYSTEM AC_LANG(C) AM_INIT_AUTOMAKE([gnu tar-ustar silent-rules]) AM_SILENT_RULES([yes]) @@ -34,25 +34,25 @@ if test "x$ac_cv_prog_cc_c99" = xno; then AC_MSG_ERROR([could not find a C99 compatible compiler]) fi AC_PROG_CPP AC_PROG_INSTALL 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 build_pgsql=probe AC_ARG_WITH(mysql, AC_HELP_STRING([--without-mysql], [Configure to work without MySQL]), [build_mysql=$withval]) 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,28 +1,28 @@ .\" 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. .\" .\" Vmod-dbrw 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-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 ");" .PP .BI "STRING dbrw.rewrite(STRING " args ");" .SH DESCRIPTION .B Vmod-dbrw is a Varnish Cache module implementing database-driven rewrite procedures. Its intended use is for web sites that need an exceedingly big number @@ -309,25 +309,25 @@ sub vcl_synth { if (resp.status == 750) { set obj.status = std.integer(req.http.X-VMOD-DBRW-Status, 301); set resp.http.Location = req.http.X-Redirect-To; return (deliver); } } .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 .ie "\V[MANCGI]"WEBDOC" \{\ Complete documentation for .B vmod-dbrw in various formats is .URL http://puszcza.gnu.org.ua/software/vmod-dbrw/manual.html "available online" . \} @@ -345,25 +345,25 @@ module are properly installed at your site, the command .in +4 .B info vmod-dbrw .in .fi .PP 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. There is NO WARRANTY, to the extent permitted by law. .\" Local variables: .\" eval: (add-hook 'write-file-hooks 'time-stamp) .\" time-stamp-start: ".TH [A-Z_][A-Z0-9_.-]* [0-9] \"" .\" time-stamp-format: "%:B %:d, %:y" .\" time-stamp-end: "\"" 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,14 +1,14 @@ /* 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. Vmod-dbrw 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 @@ -371,24 +371,28 @@ expand_backref(VRT_CTX, const char *str, const char *val, WS_Release(ctx->ws, 0); return NULL; } *p++ = 0; WS_ReleaseP(ctx->ws, p); 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); } static char * findmatch(VRT_CTX, struct dbrw_connection *conn, char **param) { unsigned i; unsigned nt, nf; |