aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS7
m---------acvmod0
-rw-r--r--configure.ac6
-rw-r--r--doc/vmod-dbrw.32
-rw-r--r--src/dbrw.h14
5 files changed, 21 insertions, 8 deletions
diff --git a/NEWS b/NEWS
index 3ee8124..0300ec3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,13 @@
1vmod-dbrw -- history of user-visible changes. 2018-12-08 1vmod-dbrw -- history of user-visible changes. 2018-12-10
2See the end of file for copying conditions. 2See the end of file for copying conditions.
3 3
4Please send vmod-dbrw bug reports to <gray@gnu.org> 4Please send vmod-dbrw bug reports to <gray@gnu.org>
5 5
6Version 2.4, 2018-12-10
7
8* Support for Varnish version 6.0.2
9
10
6Version 2.3, 2018-12-08 11Version 2.3, 2018-12-08
7 12
8* SQL idle timeout 13* SQL idle timeout
diff --git a/acvmod b/acvmod
Subproject 5f6dce2f7dd35a154333bb42d134a018b981f81 Subproject 5b214e3d72f9e261a37cf31deb41e7f8a61a181
diff --git a/configure.ac b/configure.ac
index 420041e..62c3afe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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-dbrw. If not, see <http://www.gnu.org/licenses/>. 15# along with vmod-dbrw. If not, see <http://www.gnu.org/licenses/>.
16AC_PREREQ(2.69) 16AC_PREREQ(2.69)
17AC_INIT([vmod-dbrw], 2.3, [gray@gnu.org]) 17AC_INIT([vmod-dbrw], 2.4, [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/vmod_dbrw.vcc) 20AC_CONFIG_SRCDIR(src/vmod_dbrw.vcc)
@@ -43,7 +43,9 @@ AC_PROG_MAKE_SET
43AC_HEADER_STDC 43AC_HEADER_STDC
44AC_CHECK_HEADERS([sys/stdlib.h]) 44AC_CHECK_HEADERS([sys/stdlib.h])
45 45
46AM_VARNISHAPI([4.1],[5.2.1]) 46AM_VARNISHAPI([4.1],[6.0.2])
47AC_DEFINE_UNQUOTED([VARNISHAPI_MAJOR],[$VARNISHAPI_MAJOR],
48 [Varnish API major version number])
47 49
48########### 50###########
49# Check for SQL support 51# Check for SQL support
diff --git a/doc/vmod-dbrw.3 b/doc/vmod-dbrw.3
index 21d15e2..f069ce2 100644
--- a/doc/vmod-dbrw.3
+++ b/doc/vmod-dbrw.3
@@ -298,7 +298,7 @@ sub vcl_synth {
298.\" for man-based doc pages. 298.\" for man-based doc pages.
299.if "\V[MANCGI]"WEBDOC" \{\ 299.if "\V[MANCGI]"WEBDOC" \{\
300. ds package vmod-dbrw 300. ds package vmod-dbrw
301. ds version 2.2.91 301. ds version 2.4
302. so download.inc 302. so download.inc
303\} 303\}
304.SH "SEE ALSO" 304.SH "SEE ALSO"
diff --git a/src/dbrw.h b/src/dbrw.h
index 1ff1056..bd0aa2a 100644
--- a/src/dbrw.h
+++ b/src/dbrw.h
@@ -21,10 +21,16 @@
21#include <syslog.h> 21#include <syslog.h>
22#include <regex.h> 22#include <regex.h>
23 23
24#include "vcl.h" 24#if VARNISHAPI_MAJOR > 5
25#include "vrt.h" 25# include "cache/cache.h"
26#include "vcc_if.h" 26# include "vcl.h"
27#include "cache/cache.h" 27# include "vcc_if.h"
28#else
29# include "vcl.h"
30# include "vrt.h"
31# include "vcc_if.h"
32# include "cache/cache.h"
33#endif
28#define WSPTR(s) ((s)->ws) 34#define WSPTR(s) ((s)->ws)
29 35
30struct dbrw_connection; 36struct dbrw_connection;

Return to:

Send suggestions and report system problems to the System administrator.