aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org>2020-03-27 11:50:10 +0200
committerSergey Poznyakoff <gray@gnu.org>2020-03-27 11:55:45 +0200
commit769c77fef69b2b29bff7b2b36e3acbd438e143de (patch)
treefbe77e0262270a052c6f0d706fc1d8ea91f911b5
parent2dd481fe639ac3c08daac5f4b0aa222537246f66 (diff)
downloadvmod-sql-769c77fef69b2b29bff7b2b36e3acbd438e143de.tar.gz
vmod-sql-769c77fef69b2b29bff7b2b36e3acbd438e143de.tar.bz2
Drop support for Varnish versions prior to 6.0
-rw-r--r--NEWS7
-rw-r--r--README2
m---------acvmod0
-rw-r--r--configure.ac6
-rw-r--r--src/vmod-sql.c16
5 files changed, 14 insertions, 17 deletions
diff --git a/NEWS b/NEWS
index a16e9a3..a8dba12 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,13 @@
-vmod-sql -- history of user-visible changes. 2020-03-03
+vmod-sql -- history of user-visible changes. 2020-03-27
See the end of file for copying conditions.
Please send vmod-sql bug reports to <gray@gnu.org>
+Version 1.4.90
+
+* Drop support for Varnish versions prior to 6.0.0.
+
+
Version 1.4, 2020-03-03
* Support for Varnish 6.3.1
diff --git a/README b/README
index 23ec3ca..66651cd 100644
--- a/README
+++ b/README
@@ -15,7 +15,7 @@ For accessing complete vmod-sql documentation, see the section
Vmod-sql is a module for Varnish Cache. It provides API for accessing
MySQL and PostgreSQL databases from VCL scripts.
-The module was tested with Varnish versions 4.1 and 5.1.
+The module was tested with Varnish versions 6.0.2 -- 6.3.2.
* Installation
diff --git a/acvmod b/acvmod
-Subproject 5b214e3d72f9e261a37cf31deb41e7f8a61a181
+Subproject 99b8dd21c7d1a91021b0a63c0d846ac35c4b009
diff --git a/configure.ac b/configure.ac
index 1705a26..eecc831 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
# This file is part of vmod-sql -*- autoconf -*-
-# Copyright (C) 2013-2018 Sergey Poznyakoff
+# Copyright (C) 2013-2020 Sergey Poznyakoff
#
# Vmod-sql is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with vmod-sql. If not, see <http://www.gnu.org/licenses/>.
AC_PREREQ(2.69)
-AC_INIT([vmod-sql], 1.4, [gray@gnu.org])
+AC_INIT([vmod-sql], 1.4.90, [gray@gnu.org])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR(src/vmod-sql.c)
@@ -43,7 +43,7 @@ AC_PROG_MAKE_SET
AC_HEADER_STDC
AC_CHECK_HEADERS([sys/stdlib.h])
-AM_VARNISHAPI([4.1],[6.3.2])
+AM_VARNISHAPI([6.0.2],[6.3.2])
AC_DEFINE_UNQUOTED([VARNISHAPI_MAJOR],[$VARNISHAPI_MAJOR],
[Varnish API major version number])
diff --git a/src/vmod-sql.c b/src/vmod-sql.c
index a69a251..b2f4077 100644
--- a/src/vmod-sql.c
+++ b/src/vmod-sql.c
@@ -17,17 +17,9 @@
#include "vmod-sql.h"
#include <stdarg.h>
#include "wordsplit.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
-#define WSPTR(s) ((s)->ws)
+#include <cache/cache.h>
+#include <vcl.h>
+#include <vcc_if.h>
#ifdef VPFX
# define VEVENT(a) VPFX(a)
@@ -296,7 +288,7 @@ vmod_result(VRT_CTX, struct vmod_priv *priv,
if (!s)
return NULL;
- return WS_Copy(WSPTR(ctx), s, -1);
+ return WS_Copy(ctx->ws, s, -1);
}
VCL_INT

Return to:

Send suggestions and report system problems to the System administrator.