diff options
| author | Sergey Poznyakoff <gray@gnu.org.ua> | 2020-03-10 12:56:46 +0200 |
|---|---|---|
| committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2020-03-10 12:56:46 +0200 |
| commit | 723d3ae5eb2dbb5104b0d13f4496b90961af4e9d (patch) | |
| tree | a339c2d1294f718f9a076a6c1ff16612da9f1dfe | |
| parent | bd03f702c66ba180a0daabad426160a8d45da326 (diff) | |
| download | vmod-binlog-723d3ae5eb2dbb5104b0d13f4496b90961af4e9d.tar.gz vmod-binlog-723d3ae5eb2dbb5104b0d13f4496b90961af4e9d.tar.bz2 | |
Restore backward compatibility with Varnish < 6.2v2.5
| -rw-r--r-- | NEWS | 6 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/binlog.c | 9 |
3 files changed, 14 insertions, 3 deletions
@@ -1,8 +1,12 @@ -Vmod-binlog NEWS -- history of user-visible changes. 2020-03-03 +Vmod-binlog NEWS -- history of user-visible changes. 2020-03-10 See the end of file for copying conditions. Please send Vmod-binlog bug reports to <gray@gnu.org> +Version 2.5, 2020-03-10 + +* Restore backward compatibility with Varnish versions prior to 6.2. + Version 2.4, 2020-03-03 * Support for Varnish 6.3.1 diff --git a/configure.ac b/configure.ac index 639227f..5f68c24 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-binlog. If not, see <http://www.gnu.org/licenses/>. AC_PREREQ(2.69) -AC_INIT([vmod-binlog], 2.4, [gray@gnu.org]) +AC_INIT([vmod-binlog], 2.5, [gray@gnu.org]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR(src/binlog.c) diff --git a/src/binlog.c b/src/binlog.c index 41cc228..512503d 100644 --- a/src/binlog.c +++ b/src/binlog.c @@ -40,6 +40,13 @@ #endif #define WSPTR(s) ((s)->ws) +#ifdef VPFX +# define VEVENT(a) VPFX(a) +#else +/* For compatibility with varnish prior to 6.2 */ +# define VEVENT(a) a +#endif + #include "vmod-binlog.h" #include "pack.h" #include "pthread.h" @@ -155,7 +162,7 @@ packerror(const char *fmt, ...) } int -vmod_binlog_event(VRT_CTX, struct vmod_priv *priv, enum vcl_event_e e) +VEVENT(binlog_event)(VRT_CTX, struct vmod_priv *priv, enum vcl_event_e e) { if (e == VCL_EVENT_LOAD) { struct binlog_config *conf = calloc(1, sizeof(*conf)); |