diff options
-rw-r--r-- | NEWS | 9 | ||||
-rw-r--r-- | README | 5 | ||||
m--------- | acvmod | 0 | ||||
-rw-r--r-- | configure.ac | 8 | ||||
-rw-r--r-- | src/tbf.h | 19 | ||||
-rw-r--r-- | src/vmod-tbf.3 | 8 |
6 files changed, 31 insertions, 18 deletions
@@ -1,9 +1,12 @@ -vmod-tbf -- history of user-visible changes. 2017-08-10 -Copyright (C) 2013-2017 Sergey Poznyakoff +vmod-tbf -- history of user-visible changes. 2018-12-10 See the end of file for copying conditions. Please send vmod-tbf bug reports to <gray@gnu.org> +Version 2.3, 2018-12-10 + +* Support for Varnish 6.0.2 + Version 2.2, 2017-08-10 * Support for Varnish 5.1 @@ -33,7 +36,7 @@ Initial release ========================================================================= Copyright information: -Copyright (C) 2013-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 @@ -1,5 +1,4 @@ Vmod-tbf README -Copyright (C) 2013-2017 Sergey Poznyakoff See the end of file for copying conditions. * Introduction @@ -32,6 +31,8 @@ Additionally, this module provides several auxiliary functions for checking load average of the machine, getting system time, formatting UNIX timestamps in human-readable form, etc. +The module works with Varnish versions from 4.1 to 6.0.2. + * Installation In order to compile the package you need to have the @@ -79,7 +80,7 @@ Send bug reports and suggestions to <gray@gnu.org> * Copyright information: -Copyright (C) 2013-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/configure.ac b/configure.ac index f42e2ef..64edcee 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ # This file is part of vmod-tbf -*- autoconf -*- -# Copyright (C) 2013-2017 Sergey Poznyakoff +# Copyright (C) 2013-2018 Sergey Poznyakoff # # Vmod-tbf 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-tbf. If not, see <http://www.gnu.org/licenses/>. AC_PREREQ(2.69) -AC_INIT([vmod-tbf], 2.2, [gray@gnu.org]) +AC_INIT([vmod-tbf], 2.3, [gray@gnu.org]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR(src/vmod_tbf.vcc) @@ -46,7 +46,9 @@ AC_CHECK_HEADERS(sys/sysinfo.h) # Check for functions AC_CHECK_FUNCS(sysinfo getloadavg) -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]) AC_CONFIG_TESTDIR(tests) AC_CONFIG_FILES([tests/Makefile tests/atlocal]) @@ -1,5 +1,5 @@ /* This file is part of vmod-tbf - Copyright (C) 2013-2017 Sergey Poznyakoff + Copyright (C) 2013-2018 Sergey Poznyakoff Vmod-tbf is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -23,13 +23,20 @@ #include <sys/stat.h> #include <sys/time.h> #include <errno.h> -#include <vcl.h> -#include <vrt.h> -#include "vcc_if.h" +#include <string.h> +#include <unistd.h> #include "vsha256.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) #ifndef USEC_PER_SEC diff --git a/src/vmod-tbf.3 b/src/vmod-tbf.3 index 626341c..666cc38 100644 --- a/src/vmod-tbf.3 +++ b/src/vmod-tbf.3 @@ -1,5 +1,5 @@ .\" This file is part of Vmod-tbf -*- nroff -*- -.\" Copyright (C) 2013-2014 Sergey Poznyakoff +.\" Copyright (C) 2013-2018 Sergey Poznyakoff .\" .\" Vmod-tbf 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-tbf. If not, see <http://www.gnu.org/licenses/>. -.TH VMOD-TBF 1 "February 8, 2016" "VMOD-TBF" "User Reference" +.TH VMOD-TBF 3 "December 10, 2018" "VMOD-TBF" "User Reference" .SH NAME vmod-tbf \- token bucket filtering for Varnish .SH SYNOPSIS @@ -210,7 +210,7 @@ Suspends execution for a specified amount of time. .\" for man-based doc pages. .if "\V[MANCGI]"WEBDOC" \{\ . ds package vmod-tbf -. ds version 2.0 +. ds version 2.3 . so download.inc \} .SH "SEE ALSO" @@ -221,7 +221,7 @@ Sergey Poznyakoff .SH "BUG REPORTS" Report bugs to <gray@gnu.org>. .SH COPYRIGHT -Copyright \(co 2013-2014 Sergey Poznyakoff +Copyright \(co 2013-2018 Sergey Poznyakoff .br .na License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> |