Version 1.3release-1.3

Supports Varnish 6.0.2
Includes improved version of wordsplit routines.

12 files changed, 1485 insertions, 436 deletions

diff --git a/NEWS b/NEWS
index a366dd8..21a89fa 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,13 @@
-vmod-sql -- history of user-visible changes. 2017-08-10
-Copyright (C) 2013-2017 Sergey Poznyakoff
+vmod-sql -- history of user-visible changes. 2018-12-10
 See the end of file for copying conditions.
 
 Please send vmod-sql bug reports to <gray@gnu.org>
 
+Version 1.3, 2018-12-10
+
+* Support for Varnish 6.0.2
+
+
 Version 1.2, 2017-08-10
 
 * Support for Varnish 5.1
@@ -26,7 +30,7 @@ Initial release
 =========================================================================
 Copyright information:
 
-Copyright (C) 2017 Sergey Poznyakoff
+Copyright (C) 2013-2018 Sergey Poznyakoff
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
diff --git a/acvmod b/acvmod
-Subproject 5f6dce2f7dd35a154333bb42d134a018b981f81
+Subproject 5b214e3d72f9e261a37cf31deb41e7f8a61a181
diff --git a/bootstrap b/bootstrap
index 89ccf31..42bce68 100755
--- a/bootstrap
+++ b/bootstrap
@@ -3,5 +3,7 @@ for dir in m4 build-aux
 do
         test -d $dir || mkdir $dir
 done
+git submodule init
+git submodule update
 test -f ChangeLog || touch ChangeLog
 autoreconf -f -i -s
diff --git a/configure.ac b/configure.ac
index 324794f..8eae691 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 # This file is part of vmod-sql -*- autoconf -*-
-# Copyright (C) 2013-2017 Sergey Poznyakoff
+# Copyright (C) 2013-2018 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.2, [gray@gnu.org])
+AC_INIT([vmod-sql], 1.3, [gray@gnu.org])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR(src/vmod-sql.c)
@@ -43,7 +43,9 @@ AC_PROG_MAKE_SET
 AC_HEADER_STDC
 AC_CHECK_HEADERS([sys/stdlib.h])
 
-AM_VARNISHAPI([4.1],[5.1])
+AM_VARNISHAPI([4.1],[6.0.2])
+AC_DEFINE_UNQUOTED([VARNISHAPI_MAJOR],[$VARNISHAPI_MAJOR],
+                   [Varnish API major version number])
 
 ###########
 # Check for SQL support       
diff --git a/doc/vmod-sql.3 b/doc/vmod-sql.3
index 446cfbc..ad46771 100644
--- a/doc/vmod-sql.3
+++ b/doc/vmod-sql.3
@@ -1,5 +1,5 @@
 .\" This file is part of Vmod-sql -*- nroff -*-
-.\" Copyright (C) 2013-2014 Sergey Poznyakoff
+.\" Copyright (C) 2013-2018 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
@@ -13,7 +13,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/>.
-.TH VMOD-SQL 1 "November 1, 2014" "VMOD-SQL" "User Reference"
+.TH VMOD-SQL 3 "December 10, 2018" "VMOD-SQL" "User Reference"
 .SH NAME
 vmod-sql \- SQL access for Varnish Cache
 .SH SYNOPSIS
@@ -207,7 +207,7 @@ vcl_recv {
 .\" for man-based doc pages.
 .if "\V[MANCGI]"WEBDOC" \{\
 .       ds package vmod-sql
-.       ds version 1.0
+.       ds version 1.3
 .       so download.inc
 \}
 .SH "SEE ALSO"
@@ -253,7 +253,7 @@ Sergey Poznyakoff
 .SH "BUG REPORTS"
 Report bugs to <gray@gnu.org>.
 .SH COPYRIGHT
-Copyright \(co 2013 Sergey Poznyakoff
+Copyright \(co 2013-2018 Sergey Poznyakoff
 .br
 .na
 License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
diff --git a/src/mysql.c b/src/mysql.c
index f113b10..3cfbe03 100644
--- a/src/mysql.c
+++ b/src/mysql.c
@@ -1,5 +1,5 @@
 /* This file is part of vmod-sql
-   Copyright (C) 2013-2014 Sergey Poznyakoff
+   Copyright (C) 2013-2018 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
@@ -211,7 +211,8 @@ s_mysql_num_tuples(struct vmod_sql_connection *conn)
 }
 
 static const char *
-s_mysql_get_column(struct vmod_sql_connection *conn, size_t nrow, size_t ncol)
+s_mysql_get_column(struct vmod_sql_connection *conn,
+                   unsigned nrow, unsigned ncol)
 {
         struct vmod_mysql_data *mp = conn->data;
         MYSQL_ROW row;
diff --git a/src/pgsql.c b/src/pgsql.c
index 9d420fc..80b316a 100644
--- a/src/pgsql.c
+++ b/src/pgsql.c
@@ -1,5 +1,5 @@
 /* This file is part of vmod-sql
-   Copyright (C) 2013-2014 Sergey Poznyakoff
+   Copyright (C) 2013-2018 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
@@ -142,7 +142,8 @@ s_pgsql_num_tuples(struct vmod_sql_connection *conn)
 }
 
 static const char *
-s_pgsql_get_column(struct vmod_sql_connection *conn, size_t nrow, size_t ncol)
+s_pgsql_get_column(struct vmod_sql_connection *conn,
+                   unsigned nrow, unsigned ncol)
 {
         struct vmod_pgsql_data *dp = conn->data;
 
diff --git a/src/sql.c b/src/sql.c
index 3ceb95c..4b99f6a 100644
--- a/src/sql.c
+++ b/src/sql.c
@@ -1,5 +1,5 @@
 /* This file is part of vmod-sql
-   Copyright (C) 2013-2014 Sergey Poznyakoff
+   Copyright (C) 2013-2018 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
diff --git a/src/vmod-sql.c b/src/vmod-sql.c
index 689b0f7..3653f69 100644
--- a/src/vmod-sql.c
+++ b/src/vmod-sql.c
@@ -1,5 +1,5 @@
 /* This file is part of vmod-sql
-   Copyright (C) 2013-2017 Sergey Poznyakoff
+   Copyright (C) 2013-2018 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
@@ -17,13 +17,18 @@
 #include "vmod-sql.h"
 #include <stdarg.h>
 #include "wordsplit.h"
-#include "vcl.h"
-#include "vrt.h"
-#include "vcc_if.h"
-#include "pthread.h"
-
-#include "cache/cache.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 "pthread.h"
 
 static pthread_once_t thread_once = PTHREAD_ONCE_INIT;
 static pthread_key_t thread_key;
diff --git a/src/vmod-sql.h b/src/vmod-sql.h
index 2a423fe..e171414 100644
--- a/src/vmod-sql.h
+++ b/src/vmod-sql.h
@@ -1,5 +1,5 @@
 /* This file is part of vmod-sql
-   Copyright (C) 2013-2014 Sergey Poznyakoff
+   Copyright (C) 2013-2018 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
diff --git a/src/wordsplit.c b/src/wordsplit.c
index f4740bf..bad59b1 100644
--- a/