Dropped support for varnish < 6.0

5 files changed, 14 insertions, 17 deletions

diff --git a/NEWS b/NEWS
index 4984b67..83d6500 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,13 @@
-vmod-tbf -- history of user-visible changes. 2020-03-03
+vmod-tbf -- history of user-visible changes. 2020-03-26
 See the end of file for copying conditions.
 
 Please send vmod-tbf bug reports to <gray@gnu.org>
 
+Version 2.4.90 (git)
+
+* Drop support for Varnish versions prior to 6.0
+
+
 Version 2.4, 2020-03-03
 
 * Support for Varnish 6.3.1
diff --git a/acvmod b/acvmod
-Subproject 5b214e3d72f9e261a37cf31deb41e7f8a61a181
+Subproject b68d558d7aef78eca1417e59ebb0ae38c276e9e
diff --git a/configure.ac b/configure.ac
index f296b3c..6cda22e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with vmod-tbf.  If not, see <http://www.gnu.org/licenses/>.
 AC_PREREQ(2.69)
-AC_INIT([vmod-tbf], 2.4, [gray@gnu.org])
+AC_INIT([vmod-tbf], 2.4.90, [gray@gnu.org])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR(src/vmod_tbf.vcc)
diff --git a/src/tbf.h b/src/tbf.h
index 1a851c7..27634fa 100644
--- a/src/tbf.h
+++ b/src/tbf.h
@@ -27,17 +27,9 @@
 #include <unistd.h>
 #include "vsha256.h"
 #include "pthread.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)
diff --git a/src/time.c b/src/time.c
index b76a137..203d3bf 100644
--- a/src/time.c
+++ b/src/time.c
@@ -30,15 +30,15 @@ vmod_strftime(VRT_CTX, VCL_STRING format, VCL_INT timestamp)
         size_t u, n;
         char *p;
         
-        u = WS_Reserve(WSPTR(ctx), 0);
-        p = WSPTR(ctx)->f;
+        u = WS_ReserveAll(ctx->ws);
+        p = ctx->ws->f;
         n = strftime(p, u, format, gmtime(&ts));
         if (n == 0) {
-                WS_Release(WSPTR(ctx), 0);
+                WS_Release(ctx->ws, 0);
                 return NULL;
         }
 
-        WS_Release(WSPTR(ctx), n + 1);
+        WS_Release(ctx->ws, n + 1);
 
         return p;
 }