From phk at FreeBSD.org  Wed Nov  1 08:51:06 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Wed,  1 Nov 2017 08:51:06 +0000 (UTC)
Subject: [master] d19ce7d Flexelinting
Message-ID: <20171101085106.31EE0A6E6F@lists.varnish-cache.org>


commit d19ce7dd6f703bbe07532ea5e1003d857bdedf1a
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Nov 1 08:50:10 2017 +0000

    Flexelinting

diff --git a/bin/varnishd/cache/cache_backend_cfg.c b/bin/varnishd/cache/cache_backend_cfg.c
index 84a0cb1..16e51e3 100644
--- a/bin/varnishd/cache/cache_backend_cfg.c
+++ b/bin/varnishd/cache/cache_backend_cfg.c
@@ -49,7 +49,7 @@
 
 #include "VSC_vbe.h"
 
-static const char *vbe_proto_ident = "HTTP Backend";
+static const char * const vbe_proto_ident = "HTTP Backend";
 
 static VTAILQ_HEAD(, backend) backends = VTAILQ_HEAD_INITIALIZER(backends);
 static VTAILQ_HEAD(, backend) cool_backends =
diff --git a/bin/varnishd/cache/cache_panic.c b/bin/varnishd/cache/cache_panic.c
index e84c4b7..75faef9 100644
--- a/bin/varnishd/cache/cache_panic.c
+++ b/bin/varnishd/cache/cache_panic.c
@@ -45,7 +45,6 @@
 #include "common/heritage.h"
 #include "waiter/waiter.h"
 
-#include "cache_director.h"
 #include "storage/storage.h"
 #include "vcli_serve.h"
 
diff --git a/bin/varnishd/cache/cache_vcl.c b/bin/varnishd/cache/cache_vcl.c
index e61fa76..203ee18 100644
--- a/bin/varnishd/cache/cache_vcl.c
+++ b/bin/varnishd/cache/cache_vcl.c
@@ -39,7 +39,6 @@
 #include "common/heritage.h"
 
 #include "vcl.h"
-#include "waiter/waiter.h"
 
 #include "cache_director.h"
 #include "cache_backend.h"
diff --git a/bin/varnishd/http2/cache_http2_send.c b/bin/varnishd/http2/cache_http2_send.c
index 0c5344d..a369df7 100644
--- a/bin/varnishd/http2/cache_http2_send.c
+++ b/bin/varnishd/http2/cache_http2_send.c
@@ -165,8 +165,7 @@ h2_win_limit(const struct h2_req *r2, const struct h2_sess *h2)
 }
 
 static void
-h2_win_charge(struct h2_req *r2, struct h2_sess *h2,
-    uint32_t w)
+h2_win_charge(struct h2_req *r2, const struct h2_sess *h2, uint32_t w)
 {
 	CHECK_OBJ_NOTNULL(r2, H2_REQ_MAGIC);
 	CHECK_OBJ_NOTNULL(h2, H2_SESS_MAGIC);
diff --git a/bin/varnishtest/vtc_http2.c b/bin/varnishtest/vtc_http2.c
index a24dd1e..e75120f 100644
--- a/bin/varnishtest/vtc_http2.c
+++ b/bin/varnishtest/vtc_http2.c
@@ -931,7 +931,7 @@ cmd_var_resolve(const struct stream *s, const char *spec, char *buf)
 		CHECK_LAST_FRAME(PING);
 		return (f->md.ping.data);
 	}
-	else if (!strcmp(spec, "ping.ack")) {
+	if (!strcmp(spec, "ping.ack")) {
 		CHECK_LAST_FRAME(PING);
 		snprintf(buf, 20, (f->flags & ACK) ? "true" : "false");
 		return (buf);
@@ -940,7 +940,7 @@ cmd_var_resolve(const struct stream *s, const char *spec, char *buf)
 	 * winup.size
 	 *	The size of the upgrade given by the WINDOW_UPDATE frame.
 	 */
-	else if (!strcmp(spec, "winup.size")) {
+	if (!strcmp(spec, "winup.size")) {
 		CHECK_LAST_FRAME(WINDOW_UPDATE);
 		RETURN_BUFFED(f->md.winup_size);
 	}
@@ -954,16 +954,16 @@ cmd_var_resolve(const struct stream *s, const char *spec, char *buf)
 	 * prio.weight
 	 *	The dependency weight.
 	 */
-	else if (!strcmp(spec, "prio.stream")) {
+	if (!strcmp(spec, "prio.stream")) {
 		CHECK_LAST_FRAME(PRIORITY);
 		RETURN_BUFFED(f->md.prio.stream);
 	}
-	else if (!strcmp(spec, "prio.exclusive")) {
+	if (!strcmp(spec, "prio.exclusive")) {
 		CHECK_LAST_FRAME(PRIORITY);
 		snprintf(buf, 20, f->md.prio.exclusive ? "true" : "false");
 		return (buf);
 	}
-	else if (!strcmp(spec, "prio.weight")) {
+	if (!strcmp(spec, "prio.weight")) {
 		CHECK_LAST_FRAME(PRIORITY);
 		RETURN_BUFFED(f->md.prio.weight);
 	}
@@ -971,7 +971,7 @@ cmd_var_resolve(const struct stream *s, const char *spec, char *buf)
 	 * rst.err
 	 *	The error code (as integer) of the RESET_STREAM frame.
 	 */
-	else if (!strcmp(spec, "rst.err")) {
+	if (!strcmp(spec, "rst.err")) {
 		CHECK_LAST_FRAME(RST_STREAM);
 		RETURN_BUFFED(f->md.rst_err);
 	}
@@ -999,14 +999,14 @@ cmd_var_resolve(const struct stream *s, const char *spec, char *buf)
 	 * settings.hdrsize
 	 *	Value of MAX_HEADER_LIST_SIZE if set, <undef> otherwise.
 	 */
-	else if (!strncmp(spec, "settings.", 9)) {
+	if (!strncmp(spec, "settings.", 9)) {
 		CHECK_LAST_FRAME(SETTINGS);
 		spec += 9;
 		if (!strcmp(spec, "ack")) {
 			snprintf(buf, 20, (f->flags & ACK) ? "true" : "false");
 			return (buf);
 		}
-		else if (!strcmp(spec, "push")) {
+		if (!strcmp(spec, "push")) {
 			if (isnan(f->md.settings[2]))
 				return (NULL);
 			else if (f->md.settings[2] == 1)
@@ -1015,17 +1015,17 @@ cmd_var_resolve(const struct stream *s, const char *spec, char *buf)
 				snprintf(buf, 20, "false");
 			return (buf);
 		}
-		else if (!strcmp(spec, "hdrtbl"))     { RETURN_SETTINGS(1); }
-		else if (!strcmp(spec, "maxstreams")) { RETURN_SETTINGS(3); }
-		else if (!strcmp(spec, "winsize"))    { RETURN_SETTINGS(4); }
-		else if (!strcmp(spec, "framesize"))  { RETURN_SETTINGS(5); }
-		else if (!strcmp(spec, "hdrsize"))    { RETURN_SETTINGS(6); }
+		if (!strcmp(spec, "hdrtbl"))     { RETURN_SETTINGS(1); }
+		if (!strcmp(spec, "maxstreams")) { RETURN_SETTINGS(3); }
+		if (!strcmp(spec, "winsize"))    { RETURN_SETTINGS(4); }
+		if (!strcmp(spec, "framesize"))  { RETURN_SETTINGS(5); }
+		if (!strcmp(spec, "hdrsize"))    { RETURN_SETTINGS(6); }
 	}
 	/* SECTION: stream.spec.zexpect.push PUSH_PROMISE specific
 	 * push.id
 	 *	The id of the promised stream.
 	 */
-	else if (!strcmp(spec, "push.id")) {
+	if (!strcmp(spec, "push.id")) {
 		CHECK_LAST_FRAME(PUSH_PROMISE);
 		RETURN_BUFFED(f->md.promised);
 	}
@@ -1039,7 +1039,7 @@ cmd_var_resolve(const struct stream *s, const char *spec, char *buf)
 	 * goaway.debug
 	 *	Debug data, if any.
 	 */
-	else if (!strncmp(spec, "goaway.", 7)) {
+	if (!strncmp(spec, "goaway.", 7)) {
 		spec += 7;
 		CHECK_LAST_FRAME(GOAWAY);
 
@@ -1067,7 +1067,7 @@ cmd_var_resolve(const struct stream *s, const char *spec, char *buf)
 	 * frame.padding (for DATA, HEADERS, PUSH_PROMISE frames)
 	 *	Number of padded bytes.
 	 */
-	else if (!strncmp(spec, "frame.", 6)) {
+	if (!strncmp(spec, "frame.", 6)) {
 		spec += 6;
 		if (!f)
 			vtc_fatal(s->hp->vl, "No frame received yet.");
@@ -1096,19 +1096,19 @@ cmd_var_resolve(const struct stream *s, const char *spec, char *buf)
 	 * stream.dependency
 	 *	Id of the stream this one depends on.
 	 */
-	else if (!strcmp(spec, "stream.window")) {
+	if (!strcmp(spec, "stream.window")) {
 		snprintf(buf, 20, "%jd",
 		    (intmax_t)(s->id ? s->ws : s->hp->ws));
 		return (buf);
 	}
-	else if (!strcmp(spec, "stream.weight")) {
+	if (!strcmp(spec, "stream.weight")) {
 		if (s->id) {
 			snprintf(buf, 20, "%d", s->weight);
 			return (buf);
 		} else
 			return (NULL);
 	}
-	else if (!strcmp(spec, "stream.dependency")) {
+	if (!strcmp(spec, "stream.dependency")) {
 		if (s->id) {
 			snprintf(buf, 20, "%d", s->dependency);
 			return (buf);
@@ -1133,7 +1133,7 @@ cmd_var_resolve(const struct stream *s, const char *spec, char *buf)
 	 *	Value of the header at index INT of the decoding/encoding
 	 *	table.
 	 */
-	else if (!strncmp(spec, "tbl.dec", 7) || !strncmp(spec, "tbl.enc", 7)) {
+	if (!strncmp(spec, "tbl.dec", 7) || !strncmp(spec, "tbl.enc", 7)) {
 		if (spec[4] == 'd')
 			ctx = s->hp->decctx;
 		else
@@ -1186,7 +1186,7 @@ cmd_var_resolve(const struct stream *s, const char *spec, char *buf)
 	 * req.scheme / resp.scheme
 	 *	:method pseudo-header's value.
 	 */
-	else if (!strncmp(spec, "req.", 4) || !strncmp(spec, "resp.", 5)) {
+	if (!strncmp(spec, "req.", 4) || !strncmp(spec, "resp.", 5)) {
 		if (spec[2] == 'q') {
 			h = s->req;
 			spec += 4;
@@ -1214,11 +1214,9 @@ cmd_var_resolve(const struct stream *s, const char *spec, char *buf)
 			return (NULL);
 	}
 #define H2_ERROR(U,v,sc,t) \
-	else if (!strcmp(spec, #U)) { return (#v); }
+	if (!strcmp(spec, #U)) { return (#v); }
 #include "tbl/h2_error.h"
-	else
-		return (spec);
-	return (NULL);
+	return (spec);
 }
 
 /* SECTION: stream.spec.frame_sendhex sendhex
diff --git a/flint.lnt b/flint.lnt
index aab7299..5f57bef 100644
--- a/flint.lnt
+++ b/flint.lnt
@@ -16,6 +16,8 @@
 
 +libh(../../config.h)
 
+-esym(768, vmod_priv)	// global struct member '___' (___) not referenced
+
 ///////////////////////////////////////////////////////////////////////
 // Thread/locking, too many false positives still
 -e454		// A thread mutex has been locked but not unlocked___
@@ -77,7 +79,6 @@
 -esym(534, sleep)
 -esym(534, usleep)
 
--esym(768, vmod_priv)	// global struct member '___' (___) not referenced
 
 ///////////////////////////////////////////////////////////////////////
 // <vas.h>

From phk at FreeBSD.org  Wed Nov  1 11:07:05 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Wed,  1 Nov 2017 11:07:05 +0000 (UTC)
Subject: [master] 0b95ce0 Include file and other polishing
Message-ID: <20171101110705.B173FA6861@lists.varnish-cache.org>


commit 0b95ce01636c7db9702956a87475851ffead0584
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Nov 1 11:06:02 2017 +0000

    Include file and other polishing

diff --git a/include/vrt.h b/include/vrt.h
index 391a9e3..2c661a0 100644
--- a/include/vrt.h
+++ b/include/vrt.h
@@ -193,19 +193,6 @@ struct vmod_data {
 };
 
 /***********************************************************************
- * Enum for which HTTP header-sets we can access
- */
-
-enum gethdr_e {
-	HDR_REQ,
-	HDR_REQ_TOP,
-	HDR_RESP,
-	HDR_OBJ,
-	HDR_BEREQ,
-	HDR_BERESP
-};
-
-/***********************************************************************
  * Enum for events sent to compiled VCL and from there to Vmods
  */
 
@@ -218,13 +205,6 @@ enum vcl_event_e {
 
 /***********************************************************************/
 
-struct gethdr_s {
-	enum gethdr_e	where;
-	const char	*what;
-};
-
-/***********************************************************************/
-
 extern const void * const vrt_magic_string_end;
 extern const void * const vrt_magic_string_unset;
 
@@ -299,11 +279,8 @@ struct vrt_backend_probe {
 	VRT_BACKEND_PROBE_FIELDS(const)
 };
 
-/***********************************************************************/
-
-/*
- * other stuff.
- * XXX: document when bored
+/***********************************************************************
+ * VRT_count() refers to this structure for coordinates into the VCL source.
  */
 
 struct vrt_ref {
@@ -314,8 +291,11 @@ struct vrt_ref {
 	const char	*token;
 };
 
-/* ACL related */
-#define VRT_ACL_MAXADDR		16	/* max(IPv4, IPv6) */
+void VRT_count(VRT_CTX, unsigned);
+
+/***********************************************************************
+ * Implementation details of ACLs
+ */
 
 typedef int acl_match_f(VRT_CTX, const VCL_IP);
 
@@ -325,28 +305,53 @@ struct vrt_acl {
 	acl_match_f	*match;
 };
 
-void VRT_acl_log(VRT_CTX, const char *msg);
+void VRT_acl_log(VRT_CTX, const char *);
 int VRT_acl_match(VRT_CTX, VCL_ACL, VCL_IP);
 
-/* req related */
+/***********************************************************************
+ * Compile time regexp
+ */
+
+void VRT_re_init(void **, const char *);
+void VRT_re_fini(void *);
+int VRT_re_match(VRT_CTX, const char *, void *);
+
+/***********************************************************************
+ * Getting hold of the various struct http
+ */
+
+enum gethdr_e {
+	HDR_REQ,
+	HDR_REQ_TOP,
+	HDR_RESP,
+	HDR_OBJ,
+	HDR_BEREQ,
+	HDR_BERESP
+};
+
+struct gethdr_s {
+	enum gethdr_e	where;
+	const char	*what;
+};
+
+struct http *VRT_selecthttp(VRT_CTX, enum gethdr_e);
+const char *VRT_GetHdr(VRT_CTX, const struct gethdr_s *);
+
+/***********************************************************************
+ * req related
+ */
 
 VCL_BYTES VRT_CacheReqBody(VRT_CTX, VCL_BYTES maxsize);
 
 /* Regexp related */
-void VRT_re_init(void **, const char *);
-void VRT_re_fini(void *);
-int VRT_re_match(VRT_CTX, const char *, void *re);
-const char *VRT_regsub(VRT_CTX, int all, const char *, void *, const char *);
 
+const char *VRT_regsub(VRT_CTX, int all, const char *, void *, const char *);
 void VRT_ban_string(VRT_CTX, const char *);
 unsigned VRT_purge(VRT_CTX, double ttl, double grace, double keep);
 
-void VRT_count(VRT_CTX, unsigned);
 void VRT_synth(VRT_CTX, unsigned, const char *);
 void VRT_hit_for_pass(VRT_CTX, VCL_DURATION);
 
-struct http *VRT_selecthttp(VRT_CTX, enum gethdr_e);
-const char *VRT_GetHdr(VRT_CTX, const struct gethdr_s *);
 void VRT_SetHdr(VRT_CTX, const struct gethdr_s *, const char *, ...);
 void VRT_handling(VRT_CTX, unsigned hand);
 void VRT_fail(VRT_CTX, const char *fmt, ...) __v_printflike(2,3);
@@ -385,6 +390,8 @@ VCL_VCL VRT_vcl_get(VRT_CTX, const char *);
 void VRT_vcl_rel(VRT_CTX, VCL_VCL);
 void VRT_vcl_select(VRT_CTX, VCL_VCL);
 
+typedef int vmod_event_f(VRT_CTX, struct vmod_priv *, enum vcl_event_e);
+
 typedef void vmod_priv_free_f(void *);
 struct vmod_priv {
 	void			*priv;
@@ -415,12 +422,6 @@ const char *VRT_BACKEND_string(VCL_BACKEND);
 const char *VRT_STEVEDORE_string(VCL_STEVEDORE);
 const char *VRT_CollectString(VRT_CTX, const char *p, ...);
 
-typedef int vcl_event_f(VRT_CTX, enum vcl_event_e);
-typedef int vcl_init_f(VRT_CTX);
-typedef void vcl_fini_f(VRT_CTX);
-typedef void vcl_func_f(VRT_CTX);
-typedef int vmod_event_f(VRT_CTX, struct vmod_priv *, enum vcl_event_e);
-
 #ifdef va_start	// XXX: hackish
 void *VRT_VSC_Alloc(const char *, size_t, size_t, const unsigned char *, size_t,
     const char *, va_list);
diff --git a/lib/libvcc/generate.py b/lib/libvcc/generate.py
index fa03724..d1c7dd4 100755
--- a/lib/libvcc/generate.py
+++ b/lib/libvcc/generate.py
@@ -1144,6 +1144,12 @@ fo.write("\n" + tbl40("#define VCL_RET_MAX", "%d\n" % n))
 
 
 fo.write("""
+
+typedef int vcl_event_f(VRT_CTX, enum vcl_event_e);
+typedef int vcl_init_f(VRT_CTX);
+typedef void vcl_fini_f(VRT_CTX);
+typedef void vcl_func_f(VRT_CTX);
+
 struct VCL_conf {
 	unsigned			magic;
 #define VCL_CONF_MAGIC			0x7406c509	/* from /dev/random */
@@ -1151,7 +1157,7 @@ struct VCL_conf {
 	struct director			**default_director;
 	const struct vrt_backend_probe	*default_probe;
 	unsigned			nref;
-	struct vrt_ref			*ref;
+	const struct vrt_ref		*ref;
 
 	unsigned			nsrc;
 	const char			**srcname;
@@ -1161,7 +1167,7 @@ struct VCL_conf {
 """)
 
 for i in returns:
-	fo.write("\tvcl_func_f\t*" + i[0] + "_func;\n")
+	fo.write("\tvcl_func_f\t\t\t*" + i[0] + "_func;\n")
 
 fo.write("\n};\n")
 fo.close()
diff --git a/lib/libvcc/vcc_acl.c b/lib/libvcc/vcc_acl.c
index 9dd361e..1c80487 100644
--- a/lib/libvcc/vcc_acl.c
+++ b/lib/libvcc/vcc_acl.c
@@ -39,9 +39,11 @@
 
 #include "vcc_compile.h"
 
+#define ACL_MAXADDR	(sizeof(struct in6_addr) + 1)
+
 struct acl_e {
 	VTAILQ_ENTRY(acl_e)	list;
-	unsigned char		data[VRT_ACL_MAXADDR + 1];
+	unsigned char		data[ACL_MAXADDR];
 	unsigned		mask;
 	unsigned		not;
 	unsigned		para;
@@ -121,7 +123,8 @@ vcc_acl_add_entry(struct vcc *tl, const struct acl_e *ae, int l,
 	aen->data[0] = fam & 0xff;
 	aen->mask += 8;
 
-	memcpy(aen->data + 1, u, l);
+	assert(l + 1L <= sizeof aen->data);
+	memcpy(aen->data + 1L, u, l);
 
 	VTAILQ_FOREACH(ae2, &tl->acl, list) {
 		i = vcl_acl_cmp(aen, ae2);
@@ -344,7 +347,7 @@ vcc_acl_emit(struct vcc *tl, const char *name, const char *rname, int anon)
 {
 	struct acl_e *ae;
 	int depth, l, m, i;
-	unsigned at[VRT_ACL_MAXADDR + 1];
+	unsigned at[ACL_MAXADDR];
 	struct token *t;
 	struct inifin *ifp;
 	struct vsb *func;
diff --git a/lib/libvcc/vcc_compile.c b/lib/libvcc/vcc_compile.c
index 468a4c5..fcf1665 100644
--- a/lib/libvcc/vcc_compile.c
+++ b/lib/libvcc/vcc_compile.c
@@ -219,9 +219,9 @@ EmitCoordinates(const struct vcc *tl, struct vsb *vsb)
 
 	VSB_printf(vsb, "/* ---===### Location Counters ###===---*/\n");
 
-	VSB_printf(vsb, "\n#define VGC_NREFS %u\n", tl->cnt + 1);
+	VSB_printf(vsb, "\n#define VGC_NREFS %u\n\n", tl->cnt + 1);
 
-	VSB_printf(vsb, "\nstatic struct vrt_ref VGC_ref[VGC_NREFS] = {\n");
+	VSB_printf(vsb, "static const struct vrt_ref VGC_ref[VGC_NREFS] = {\n");
 	lin = 1;
 	pos = 0;
 	sp = 0;
diff --git a/tools/include_wash.py b/tools/include_wash.py
index 6dd12f6..1284e30 100644
--- a/tools/include_wash.py
+++ b/tools/include_wash.py
@@ -28,7 +28,7 @@ def check(fn):
 		for i in ("stddef.h", "stdint.h", "cache/cache.h", "cache.h"):
 			if i in l:
 				print(fn, i + " included with vrt.h")
-		
+
 	for i in ("cache/cache.h", "cache.h"):
 		if i in l:
 			for i in (

From nils.goroll at uplex.de  Thu Nov  2 10:47:05 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Thu,  2 Nov 2017 10:47:05 +0000 (UTC)
Subject: [master] 97781c1 mark a minor issue
Message-ID: <20171102104705.8BB71A7229@lists.varnish-cache.org>


commit 97781c12146a16ad75439ccec681807115d6d7c0
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Thu Nov 2 11:31:25 2017 +0100

    mark a minor issue

diff --git a/bin/varnishd/http1/cache_http1_line.c b/bin/varnishd/http1/cache_http1_line.c
index 476c8e3..cb86c83 100644
--- a/bin/varnishd/http1/cache_http1_line.c
+++ b/bin/varnishd/http1/cache_http1_line.c
@@ -30,6 +30,11 @@
  * We try to use writev() if possible in order to minimize number of
  * syscalls made and packets sent.  It also just might allow the worker
  * thread to complete the request without holding stuff locked.
+ *
+ * XXX: chunked header (generated in Flush) and Tail (EndChunk)
+ *      are not accounted by means of the size_t returned. Obvious ideas:
+ *	- add size_t return value to Flush and EndChunk
+ *	- base accounting on (struct v1l).cnt
  */
 
 #include "config.h"

From phk at FreeBSD.org  Thu Nov  2 12:02:25 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Thu,  2 Nov 2017 12:02:25 +0000 (UTC)
Subject: [master] 0245af8 Add an optional $Prefix stanza,
 which substitutes another string for the default symbolname prefix
 ("vmod_")
Message-ID: <20171102120225.17947A799B@lists.varnish-cache.org>


commit 0245af844aeb386c3cb8c8be98cf54f53366fa86
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Nov 2 07:12:12 2017 +0000

    Add an optional $Prefix stanza, which substitutes another string
    for the default symbolname prefix ("vmod_")

diff --git a/lib/libvcc/vmodtool.py b/lib/libvcc/vmodtool.py
index 6e40650..6698a9d 100755
--- a/lib/libvcc/vmodtool.py
+++ b/lib/libvcc/vmodtool.py
@@ -434,7 +434,7 @@ class s_module(stanza):
 
 	def rsthead(self, fo, man):
 
-		write_rst_hdr(fo, "vmod_" + self.vcc.modname, "=", "=")
+		write_rst_hdr(fo, self.vcc.sympfx + self.vcc.modname, "=", "=")
 		fo.write("\n")
 
 		write_rst_hdr(fo, self.vcc.moddesc, "-", "-")
@@ -486,6 +486,11 @@ class s_abi(stanza):
 		strict_abi = self.line[1] == 'strict'
 		self.vcc.contents.append(self)
 
+class s_prefix(stanza):
+	def parse(self):
+		self.vcc.sympfx = self.line[1] + "_"
+		self.vcc.contents.append(self)
+
 class s_event(stanza):
 	def parse(self):
 		self.event_func = self.line[1]
@@ -516,7 +521,7 @@ class s_function(stanza):
 		self.vcc.contents.append(self)
 
 	def hfile(self, fo):
-		fn = "vmod_" + self.proto.name
+		fn = self.vcc.sympfx + self.proto.name
 		s = "%s %s(VRT_CTX" % (self.proto.c_ret(), fn)
 		s += self.proto.c_args() + ");"
 		for i in lwrap(s):
@@ -533,7 +538,7 @@ class s_function(stanza):
 		fmt_cstruct(fo, self.vcc.modname, self.proto.cname())
 
 	def cstruct_init(self, fo):
-		fo.write("\tvmod_" + self.proto.cname() + ",\n")
+		fo.write("\t" + self.vcc.sympfx + self.proto.cname() + ",\n")
 
 	def specstr(self, fo):
 		fo.write('\t"$FUNC\\0"\t"%s.%s\\0"\n\n' %
@@ -567,12 +572,12 @@ class s_object(stanza):
 		return
 
 	def chfile(self, fo, h):
-		sn = "vmod_" + self.vcc.modname + "_" + self.proto.name
+		sn = self.vcc.sympfx + self.vcc.modname + "_" + self.proto.name
 		fo.write("struct %s;\n" % sn)
 
 		if h:
 			def p(x):
-				return x + " vmod_"
+				return x + " " + self.vcc.sympfx
 		else:
 			def p(x):
 				return "typedef " + x + \
@@ -611,7 +616,7 @@ class s_object(stanza):
 			i.cstruct(fo)
 
 	def cstruct_init(self, fo):
-		p = "\tvmod_"
+		p = "\t" + self.vcc.sympfx
 		fo.write(p + self.proto.name + "__init,\n")
 		fo.write(p + self.proto.name + "__fini,\n")
 		for i in self.methods:
@@ -623,8 +628,8 @@ class s_object(stanza):
 		fo.write('\t"$OBJ\\0"\t"%s.%s\\0"\n\n' %
 		    (self.vcc.modname, self.proto.name))
 
-		fo.write('\t    "struct vmod_%s_%s\\0"\n' %
-		    (self.vcc.modname, self.proto.name))
+		fo.write('\t    "struct %s%s_%s\\0"\n' %
+		    (self.vcc.sympfx, self.vcc.modname, self.proto.name))
 		fo.write("\n")
 
 		self.proto.specstr(fo, 'Vmod_%s_Func.%s__init' %
@@ -659,7 +664,7 @@ class s_method(stanza):
 		fmt_cstruct(fo, self.vcc.modname, self.proto.cname())
 
 	def cstruct_init(self, fo):
-		fo.write('\t' + "vmod_" + self.proto.cname() + ",\n")
+		fo.write('\t' + self.vcc.sympfx + self.proto.cname() + ",\n")
 
 	def specstr(self, fo):
 		fo.write('\t    "%s.%s\\0"\n' %
@@ -675,6 +680,7 @@ class vcc(object):
 		self.inputfile = inputvcc
 		self.rstdir = rstdir
 		self.pfx = outputprefix
+		self.sympfx = "vmod_"
 		self.contents = []
 		self.commit_files = []
 		self.copyright = None
@@ -701,6 +707,8 @@ class vcc(object):
 					err("$Module must be first stanze")
 			if c[0] == "Module":
 				s_module(c, b[1:], self)
+			elif c[0] == "Prefix":
+				s_prefix(c, b[1:], self)
 			elif c[0] == "ABI":
 				s_abi(c, b[1:], self)
 			elif c[0] == "Event":

From phk at FreeBSD.org  Thu Nov  2 12:02:07 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Thu,  2 Nov 2017 12:02:07 +0000 (UTC)
Subject: [master] 483bc96 Flexelinting
Message-ID: <20171102120225.064A9A7999@lists.varnish-cache.org>


commit 483bc96522f5cfc4045bd5e0fbb06b915222d079
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Nov 2 06:52:06 2017 +0000

    Flexelinting

diff --git a/bin/varnishd/http2/cache_http2.h b/bin/varnishd/http2/cache_http2.h
index fd720e6..2883789 100644
--- a/bin/varnishd/http2/cache_http2.h
+++ b/bin/varnishd/http2/cache_http2.h
@@ -223,7 +223,7 @@ h2_error H2_Send(struct worker *, struct h2_req *,
 /* cache_http2_proto.c */
 struct h2_req * h2_new_req(const struct worker *, struct h2_sess *,
     unsigned stream, struct req *);
-void h2_del_req(struct worker *, struct h2_req *);
+void h2_del_req(struct worker *, const struct h2_req *);
 void h2_kill_req(struct worker *, const struct h2_sess *,
     struct h2_req *, h2_error);
 int h2_rxframe(struct worker *, struct h2_sess *);
diff --git a/bin/varnishd/http2/cache_http2_proto.c b/bin/varnishd/http2/cache_http2_proto.c
index 0358acd..90b4b6d 100644
--- a/bin/varnishd/http2/cache_http2_proto.c
+++ b/bin/varnishd/http2/cache_http2_proto.c
@@ -161,7 +161,7 @@ h2_new_req(const struct worker *wrk, struct h2_sess *h2,
 }
 
 void
-h2_del_req(struct worker *wrk, struct h2_req *r2)
+h2_del_req(struct worker *wrk, const struct h2_req *r2)
 {
 	struct h2_sess *h2;
 	struct sess *sp;
diff --git a/lib/libvmod_debug/vmod_debug.c b/lib/libvmod_debug/vmod_debug.c
index 5ed5cd0..6b0586d 100644
--- a/lib/libvmod_debug/vmod_debug.c
+++ b/lib/libvmod_debug/vmod_debug.c
@@ -396,6 +396,10 @@ vmod_workspace_allocate(VRT_CTX, VCL_ENUM which, VCL_INT size)
 		size += WS_Reserve(ws, 0);
 		WS_Release(ws, 0);
 	}
+	if (size <= 0) {
+		VRT_fail(ctx, "Attempted negative WS allocation");
+		return;
+	}
 	s = WS_Alloc(ws, size);
 	if (!s)
 		return;
diff --git a/lib/libvmod_vtc/vmod_vtc.c b/lib/libvmod_vtc/vmod_vtc.c
index 9f8bbf9..04e79c6 100644
--- a/lib/libvmod_vtc/vmod_vtc.c
+++ b/lib/libvmod_vtc/vmod_vtc.c
@@ -151,7 +151,10 @@ vmod_workspace_alloc(VRT_CTX, VCL_ENUM which, VCL_INT size)
 		size += WS_Reserve(ws, 0);
 		WS_Release(ws, 0);
 	}
-
+	if (size <= 0) {
+		VRT_fail(ctx, "Attempted negative WS allocation");
+		return;
+	}
 	p = WS_Alloc(ws, size);
 	if (p == NULL)
 		VRT_fail(ctx, "vtc.workspace_alloc");

From phk at FreeBSD.org  Thu Nov  2 12:02:25 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Thu,  2 Nov 2017 12:02:25 +0000 (UTC)
Subject: [master] 7cdb71a Use $Prefix to avoid symbol clashes with libvmod_vtc
Message-ID: <20171102120225.3503FA799E@lists.varnish-cache.org>


commit 7cdb71aa00444001f58cd3828282bf627ff39b80
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Nov 2 07:16:10 2017 +0000

    Use $Prefix to avoid symbol clashes with libvmod_vtc

diff --git a/lib/libvmod_debug/vmod.vcc b/lib/libvmod_debug/vmod.vcc
index 324d389..b33e0d9 100644
--- a/lib/libvmod_debug/vmod.vcc
+++ b/lib/libvmod_debug/vmod.vcc
@@ -27,6 +27,7 @@
 
 $Module debug 3 Development, test and debug
 $ABI strict
+$Prefix xyzzy
 
 DESCRIPTION
 ===========
diff --git a/lib/libvmod_debug/vmod_debug.c b/lib/libvmod_debug/vmod_debug.c
index 6b0586d..74718e7 100644
--- a/lib/libvmod_debug/vmod_debug.c
+++ b/lib/libvmod_debug/vmod_debug.c
@@ -65,7 +65,7 @@ struct priv_vcl {
 static VCL_DURATION vcl_release_delay = 0.0;
 
 VCL_VOID __match_proto__(td_debug_panic)
-vmod_panic(VRT_CTX, const char *str, ...)
+xyzzy_panic(VRT_CTX, const char *str, ...)
 {
 	va_list ap;
 	const char *b;
@@ -79,7 +79,7 @@ vmod_panic(VRT_CTX, const char *str, ...)
 }
 
 VCL_STRING __match_proto__(td_debug_author)
-vmod_author(VRT_CTX, VCL_ENUM person, VCL_ENUM someone)
+xyzzy_author(VRT_CTX, VCL_ENUM person, VCL_ENUM someone)
 {
 	(void)someone;
 
@@ -96,7 +96,7 @@ vmod_author(VRT_CTX, VCL_ENUM person, VCL_ENUM someone)
 }
 
 VCL_VOID __match_proto__(td_debug_test_priv_call)
-vmod_test_priv_call(VRT_CTX, struct vmod_priv *priv)
+xyzzy_test_priv_call(VRT_CTX, struct vmod_priv *priv)
 {
 
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
@@ -109,7 +109,7 @@ vmod_test_priv_call(VRT_CTX, struct vmod_priv *priv)
 }
 
 VCL_STRING __match_proto__(td_debug_test_priv_task)
-vmod_test_priv_task(VRT_CTX, struct vmod_priv *priv, VCL_STRING s)
+xyzzy_test_priv_task(VRT_CTX, struct vmod_priv *priv, VCL_STRING s)
 {
 
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
@@ -131,7 +131,7 @@ vmod_test_priv_task(VRT_CTX, struct vmod_priv *priv, VCL_STRING s)
 }
 
 VCL_STRING __match_proto__(td_debug_test_priv_top)
-vmod_test_priv_top(VRT_CTX, struct vmod_priv *priv, VCL_STRING s)
+xyzzy_test_priv_top(VRT_CTX, struct vmod_priv *priv, VCL_STRING s)
 {
 
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
@@ -143,7 +143,7 @@ vmod_test_priv_top(VRT_CTX, struct vmod_priv *priv, VCL_STRING s)
 }
 
 VCL_VOID __match_proto__(td_debug_test_priv_vcl)
-vmod_test_priv_vcl(VRT_CTX, struct vmod_priv *priv)
+xyzzy_test_priv_vcl(VRT_CTX, struct vmod_priv *priv)
 {
 	struct priv_vcl *priv_vcl;
 
@@ -155,7 +155,7 @@ vmod_test_priv_vcl(VRT_CTX, struct vmod_priv *priv)
 }
 
 VCL_BACKEND
-vmod_no_backend(VRT_CTX)
+xyzzy_no_backend(VRT_CTX)
 {
 
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
@@ -164,7 +164,7 @@ vmod_no_backend(VRT_CTX)
 }
 
 VCL_STEVEDORE __match_proto__(td_debug_no_stevedore)
-vmod_no_stevedore(VRT_CTX)
+xyzzy_no_stevedore(VRT_CTX)
 {
 
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
@@ -173,7 +173,7 @@ vmod_no_stevedore(VRT_CTX)
 }
 
 VCL_VOID __match_proto__(td_debug_rot52)
-vmod_rot52(VRT_CTX, VCL_HTTP hp)
+xyzzy_rot52(VRT_CTX, VCL_HTTP hp)
 {
 
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
@@ -183,7 +183,7 @@ vmod_rot52(VRT_CTX, VCL_HTTP hp)
 }
 
 VCL_STRING __match_proto__(td_debug_argtest)
-vmod_argtest(VRT_CTX, VCL_STRING one, VCL_REAL two, VCL_STRING three,
+xyzzy_argtest(VRT_CTX, VCL_STRING one, VCL_REAL two, VCL_STRING three,
     VCL_STRING comma, VCL_INT four)
 {
 	char buf[100];
@@ -193,7 +193,7 @@ vmod_argtest(VRT_CTX, VCL_STRING one, VCL_REAL two, VCL_STRING three,
 }
 
 VCL_INT __match_proto__(td_debug_vre_limit)
-vmod_vre_limit(VRT_CTX)
+xyzzy_vre_limit(VRT_CTX)
 {
 	(void)ctx;
 	return (cache_param->vre_limits.match);
@@ -220,7 +220,7 @@ obj_cb(struct worker *wrk, void *priv, struct objcore *oc, unsigned event)
 }
 
 VCL_VOID __match_proto__(td_debug_register_obj_events)
-vmod_register_obj_events(VRT_CTX, struct vmod_priv *priv)
+xyzzy_register_obj_events(VRT_CTX, struct vmod_priv *priv)
 {
 	struct priv_vcl *priv_vcl;
 
@@ -233,7 +233,7 @@ vmod_register_obj_events(VRT_CTX, struct vmod_priv *priv)
 }
 
 VCL_VOID __match_proto__(td_debug_fail)
-vmod_fail(VRT_CTX)
+xyzzy_fail(VRT_CTX)
 {
 
 	VRT_fail(ctx, "Forced failure");
@@ -356,7 +356,7 @@ event_function(VRT_CTX, struct vmod_priv *priv, enum vcl_event_e e)
 }
 
 VCL_VOID __match_proto__(td_debug_sleep)
-vmod_sleep(VRT_CTX, VCL_DURATION t)
+xyzzy_sleep(VRT_CTX, VCL_DURATION t)
 {
 
 	CHECK_OBJ_ORNULL(ctx, VRT_CTX_MAGIC);
@@ -380,7 +380,7 @@ wsfind(VRT_CTX, VCL_ENUM which)
 }
 
 void
-vmod_workspace_allocate(VRT_CTX, VCL_ENUM which, VCL_INT size)
+xyzzy_workspace_allocate(VRT_CTX, VCL_ENUM which, VCL_INT size)
 {
 	struct ws *ws;
 	char *s;
@@ -407,7 +407,7 @@ vmod_workspace_allocate(VRT_CTX, VCL_ENUM which, VCL_INT size)
 }
 
 VCL_INT
-vmod_workspace_free(VRT_CTX, VCL_ENUM which)
+xyzzy_workspace_free(VRT_CTX, VCL_ENUM which)
 {
 	struct ws *ws;
 	unsigned u;
@@ -425,7 +425,7 @@ vmod_workspace_free(VRT_CTX, VCL_ENUM which)
 }
 
 VCL_BOOL
-vmod_workspace_overflowed(VRT_CTX, VCL_ENUM which)
+xyzzy_workspace_overflowed(VRT_CTX, VCL_ENUM which)
 {
 	struct ws *ws;
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
@@ -440,7 +440,7 @@ vmod_workspace_overflowed(VRT_CTX, VCL_ENUM which)
 static uintptr_t debug_ws_snap;
 
 void
-vmod_workspace_snap(VRT_CTX, VCL_ENUM which)
+xyzzy_workspace_snap(VRT_CTX, VCL_ENUM which)
 {
 	struct ws *ws;
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
@@ -453,7 +453,7 @@ vmod_workspace_snap(VRT_CTX, VCL_ENUM which)
 }
 
 void
-vmod_workspace_reset(VRT_CTX, VCL_ENUM which)
+xyzzy_workspace_reset(VRT_CTX, VCL_ENUM which)
 {
 	struct ws *ws;
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
@@ -466,7 +466,7 @@ vmod_workspace_reset(VRT_CTX, VCL_ENUM which)
 }
 
 void
-vmod_workspace_overflow(VRT_CTX, VCL_ENUM which)
+xyzzy_workspace_overflow(VRT_CTX, VCL_ENUM which)
 {
 	struct ws *ws;
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
@@ -479,7 +479,7 @@ vmod_workspace_overflow(VRT_CTX, VCL_ENUM which)
 }
 
 VCL_VOID __match_proto__(td_debug_vcl_release_delay)
-vmod_vcl_release_delay(VRT_CTX, VCL_DURATION delay)
+xyzzy_vcl_release_delay(VRT_CTX, VCL_DURATION delay)
 {
 
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
@@ -488,7 +488,7 @@ vmod_vcl_release_delay(VRT_CTX, VCL_DURATION delay)
 }
 
 VCL_BOOL __match_proto__(td_debug_match_acl)
-vmod_match_acl(VRT_CTX, VCL_ACL acl, VCL_IP ip)
+xyzzy_match_acl(VRT_CTX, VCL_ACL acl, VCL_IP ip)
 {
 
 	CHECK_OBJ_ORNULL(ctx, VRT_CTX_MAGIC);
@@ -499,7 +499,7 @@ vmod_match_acl(VRT_CTX, VCL_ACL acl, VCL_IP ip)
 }
 
 VCL_BOOL
-vmod_barrier_sync(VRT_CTX, VCL_STRING addr)
+xyzzy_barrier_sync(VRT_CTX, VCL_STRING addr)
 {
 	const char *err;
 	char buf[32];
@@ -532,7 +532,7 @@ vmod_barrier_sync(VRT_CTX, VCL_STRING addr)
 }
 
 VCL_VOID __match_proto__(td_debug_test_probe)
-vmod_test_probe(VRT_CTX, VCL_PROBE probe, VCL_PROBE same)
+xyzzy_test_probe(VRT_CTX, VCL_PROBE probe, VCL_PROBE same)
 {
 
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
@@ -542,7 +542,7 @@ vmod_test_probe(VRT_CTX, VCL_PROBE probe, VCL_PROBE same)
 }
 
 VCL_INT
-vmod_typesize(VRT_CTX, VCL_STRING s)
+xyzzy_typesize(VRT_CTX, VCL_STRING s)
 {
 	size_t i = 0;
 	const char *p;
diff --git a/lib/libvmod_debug/vmod_debug_dyn.c b/lib/libvmod_debug/vmod_debug_dyn.c
index 8742ff9..ad2dd29 100644
--- a/lib/libvmod_debug/vmod_debug_dyn.c
+++ b/lib/libvmod_debug/vmod_debug_dyn.c
@@ -39,7 +39,7 @@
 #include "vsa.h"
 #include "vcc_if.h"
 
-struct vmod_debug_dyn {
+struct xyzzy_debug_dyn {
 	unsigned		magic;
 #define VMOD_DEBUG_DYN_MAGIC	0x9b77ccbd
 	pthread_mutex_t		mtx;
@@ -48,7 +48,7 @@ struct vmod_debug_dyn {
 };
 
 static void
-dyn_dir_init(VRT_CTX, struct vmod_debug_dyn *dyn,
+dyn_dir_init(VRT_CTX, struct xyzzy_debug_dyn *dyn,
     VCL_STRING addr, VCL_STRING port)
 {
 	struct addrinfo hints, *res = NULL;
@@ -104,10 +104,10 @@ dyn_dir_init(VRT_CTX, struct vmod_debug_dyn *dyn,
 }
 
 VCL_VOID
-vmod_dyn__init(VRT_CTX, struct vmod_debug_dyn **dynp,
+xyzzy_dyn__init(VRT_CTX, struct xyzzy_debug_dyn **dynp,
     const char *vcl_name, VCL_STRING addr, VCL_STRING port)
 {
-	struct vmod_debug_dyn *dyn;
+	struct xyzzy_debug_dyn *dyn;
 
 	ASSERT_CLI();
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
@@ -134,9 +134,9 @@ vmod_dyn__init(VRT_CTX, struct vmod_debug_dyn **dynp,
 }
 
 VCL_VOID
-vmod_dyn__fini(struct vmod_debug_dyn **dynp)
+xyzzy_dyn__fini(struct xyzzy_debug_dyn **dynp)
 {
-	struct vmod_debug_dyn *dyn;
+	struct xyzzy_debug_dyn *dyn;
 
 	AN(dynp);
 	if (*dynp == NULL)
@@ -151,7 +151,7 @@ vmod_dyn__fini(struct vmod_debug_dyn **dynp)
 }
 
 VCL_BACKEND __match_proto__()
-vmod_dyn_backend(VRT_CTX, struct vmod_debug_dyn *dyn)
+xyzzy_dyn_backend(VRT_CTX, struct xyzzy_debug_dyn *dyn)
 {
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
 	CHECK_OBJ_NOTNULL(dyn, VMOD_DEBUG_DYN_MAGIC);
@@ -160,7 +160,7 @@ vmod_dyn_backend(VRT_CTX, struct vmod_debug_dyn *dyn)
 }
 
 VCL_VOID
-vmod_dyn_refresh(VRT_CTX, struct vmod_debug_dyn *dyn,
+xyzzy_dyn_refresh(VRT_CTX, struct xyzzy_debug_dyn *dyn,
     VCL_STRING addr, VCL_STRING port)
 {
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
diff --git a/lib/libvmod_debug/vmod_debug_obj.c b/lib/libvmod_debug/vmod_debug_obj.c
index 3364092..63f2e44 100644
--- a/lib/libvmod_debug/vmod_debug_obj.c
+++ b/lib/libvmod_debug/vmod_debug_obj.c
@@ -35,7 +35,7 @@
 
 #include "vcc_if.h"
 
-struct vmod_debug_obj {
+struct xyzzy_debug_obj {
 	unsigned		magic;
 #define VMOD_DEBUG_OBJ_MAGIC	0xccbd9b77
 	int foobar;
@@ -43,10 +43,10 @@ struct vmod_debug_obj {
 };
 
 VCL_VOID
-vmod_obj__init(VRT_CTX, struct vmod_debug_obj **op,
+xyzzy_obj__init(VRT_CTX, struct xyzzy_debug_obj **op,
     const char *vcl_name, VCL_STRING s, VCL_ENUM e)
 {
-	struct vmod_debug_obj *o;
+	struct xyzzy_debug_obj *o;
 
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
 	(void)vcl_name;
@@ -62,7 +62,7 @@ vmod_obj__init(VRT_CTX, struct vmod_debug_obj **op,
 }
 
 VCL_VOID
-vmod_obj__fini(struct vmod_debug_obj **op)
+xyzzy_obj__fini(struct xyzzy_debug_obj **op)
 {
 
 	AN(op);
@@ -72,7 +72,7 @@ vmod_obj__fini(struct vmod_debug_obj **op)
 }
 
 VCL_VOID __match_proto__()
-vmod_obj_enum(VRT_CTX, struct vmod_debug_obj *o, VCL_ENUM e)
+xyzzy_obj_enum(VRT_CTX, struct xyzzy_debug_obj *o, VCL_ENUM e)
 {
 
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
@@ -81,7 +81,7 @@ vmod_obj_enum(VRT_CTX, struct vmod_debug_obj *o, VCL_ENUM e)
 }
 
 VCL_STRING __match_proto__()
-vmod_obj_foo(VRT_CTX, struct vmod_debug_obj *o, VCL_STRING s)
+xyzzy_obj_foo(VRT_CTX, struct xyzzy_debug_obj *o, VCL_STRING s)
 {
 
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
@@ -92,7 +92,7 @@ vmod_obj_foo(VRT_CTX, struct vmod_debug_obj *o, VCL_STRING s)
 }
 
 VCL_TIME __match_proto__()
-vmod_obj_date(VRT_CTX, struct vmod_debug_obj *o)
+xyzzy_obj_date(VRT_CTX, struct xyzzy_debug_obj *o)
 {
 
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
@@ -102,7 +102,7 @@ vmod_obj_date(VRT_CTX, struct vmod_debug_obj *o)
 }
 
 VCL_STRING __match_proto__()
-vmod_obj_string(VRT_CTX, struct vmod_debug_obj *o)
+xyzzy_obj_string(VRT_CTX, struct xyzzy_debug_obj *o)
 {
 
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
@@ -112,7 +112,7 @@ vmod_obj_string(VRT_CTX, struct vmod_debug_obj *o)
 }
 
 VCL_STRING __match_proto__()
-vmod_obj_number(VRT_CTX, struct vmod_debug_obj *o)
+xyzzy_obj_number(VRT_CTX, struct xyzzy_debug_obj *o)
 {
 
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
@@ -122,30 +122,30 @@ vmod_obj_number(VRT_CTX, struct vmod_debug_obj *o)
 }
 
 VCL_VOID __match_proto__()
-vmod_obj_test_priv_call(VRT_CTX,
-    struct vmod_debug_obj *o, struct vmod_priv *priv)
+xyzzy_obj_test_priv_call(VRT_CTX,
+    struct xyzzy_debug_obj *o, struct vmod_priv *priv)
 {
 	(void)o;
-	vmod_test_priv_call(ctx, priv);
+	xyzzy_test_priv_call(ctx, priv);
 }
 VCL_VOID __match_proto__()
-vmod_obj_test_priv_vcl(VRT_CTX,
-    struct vmod_debug_obj *o, struct vmod_priv *priv)
+xyzzy_obj_test_priv_vcl(VRT_CTX,
+    struct xyzzy_debug_obj *o, struct vmod_priv *priv)
 {
 	(void)o;
-	vmod_test_priv_vcl(ctx, priv);
+	xyzzy_test_priv_vcl(ctx, priv);
 }
 VCL_STRING __match_proto__()
-vmod_obj_test_priv_task(VRT_CTX,
-    struct vmod_debug_obj *o, struct vmod_priv *priv, VCL_STRING s)
+xyzzy_obj_test_priv_task(VRT_CTX,
+    struct xyzzy_debug_obj *o, struct vmod_priv *priv, VCL_STRING s)
 {
 	(void)o;
-	return (vmod_test_priv_task(ctx, priv, s));
+	return (xyzzy_test_priv_task(ctx, priv, s));
 }
 VCL_STRING __match_proto__()
-vmod_obj_test_priv_top(VRT_CTX,
-    struct vmod_debug_obj *o, struct vmod_priv *priv, VCL_STRING s)
+xyzzy_obj_test_priv_top(VRT_CTX,
+    struct xyzzy_debug_obj *o, struct vmod_priv *priv, VCL_STRING s)
 {
 	(void)o;
-	return (vmod_test_priv_top(ctx, priv, s));
+	return (xyzzy_test_priv_top(ctx, priv, s));
 }

From phk at FreeBSD.org  Thu Nov  2 12:02:25 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Thu,  2 Nov 2017 12:02:25 +0000 (UTC)
Subject: [master] f80e7da Include all in-tree vmods
Message-ID: <20171102120225.51812A79A1@lists.varnish-cache.org>


commit f80e7da92b66307f3f1938301aabe3316f2bc44c
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Nov 2 07:16:37 2017 +0000

    Include all in-tree vmods

diff --git a/bin/varnishd/flint.sh b/bin/varnishd/flint.sh
index 1de11ce..0be99fc 100755
--- a/bin/varnishd/flint.sh
+++ b/bin/varnishd/flint.sh
@@ -19,12 +19,18 @@ FLOPS='
 	../../lib/libvarnish/*.c
 	../../lib/libvcc/flint.lnt
 	../../lib/libvcc/*.c
-	../../lib/libvmod_std/flint.lnt
-	../../lib/libvmod_std/*.c
+	../../lib/libvmod_blob/flint.lnt
+	../../lib/libvmod_blob/*.c
 	../../lib/libvmod_debug/flint.lnt
 	../../lib/libvmod_debug/*.c
 	../../lib/libvmod_directors/flint.lnt
 	../../lib/libvmod_directors/*.c
+	../../lib/libvmod_purge/flint.lnt
+	../../lib/libvmod_purge/*.c
+	../../lib/libvmod_std/flint.lnt
+	../../lib/libvmod_std/*.c
+	../../lib/libvmod_vtc/flint.lnt
+	../../lib/libvmod_vtc/*.c
 '
 
 . ../../tools/flint_skel.sh

From phk at FreeBSD.org  Thu Nov  2 12:02:25 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Thu,  2 Nov 2017 12:02:25 +0000 (UTC)
Subject: [master] f4d0280 Return early on failure
Message-ID: <20171102120225.6F226A79A4@lists.varnish-cache.org>


commit f4d02803c5dfded27b446d39039dc02f02b3717c
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Nov 2 07:44:16 2017 +0000

    Return early on failure

diff --git a/lib/libvmod_vtc/vmod_vtc.c b/lib/libvmod_vtc/vmod_vtc.c
index 04e79c6..e8fbf61 100644
--- a/lib/libvmod_vtc/vmod_vtc.c
+++ b/lib/libvmod_vtc/vmod_vtc.c
@@ -145,6 +145,8 @@ vmod_workspace_alloc(VRT_CTX, VCL_ENUM which, VCL_INT size)
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
 
 	ws = vtc_ws_find(ctx, which);
+	if (ws == NULL)
+		return;
 	WS_Assert(ws);
 
 	if (size < 0) {
@@ -171,6 +173,8 @@ vmod_workspace_free(VRT_CTX, VCL_ENUM which)
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
 
 	ws = vtc_ws_find(ctx, which);
+	if (ws == NULL)
+		return(-1);
 	WS_Assert(ws);
 
 	u = WS_Reserve(ws, 0);
@@ -178,7 +182,7 @@ vmod_workspace_free(VRT_CTX, VCL_ENUM which)
 	return (u);
 }
 
-#define VTC_WS_OP(type, name, op)			\
+#define VTC_WS_OP(type, def, name, op)			\
 VCL_##type __match_proto__(td_vtc_workspace_##name)	\
 vmod_workspace_##name(VRT_CTX, VCL_ENUM which)		\
 {							\
@@ -187,14 +191,16 @@ vmod_workspace_##name(VRT_CTX, VCL_ENUM which)		\
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);		\
 							\
 	ws = vtc_ws_find(ctx, which);			\
+	if (ws == NULL)					\
+		return def ;				\
 	WS_Assert(ws);					\
 							\
 	op;						\
 }
-VTC_WS_OP(VOID, snapshot, (vtc_ws_snapshot = WS_Snapshot(ws)))
-VTC_WS_OP(VOID, reset, WS_Reset(ws, vtc_ws_snapshot))
-VTC_WS_OP(VOID, overflow, WS_MarkOverflow(ws))
-VTC_WS_OP(BOOL, overflowed, return (WS_Overflowed(ws)))
+VTC_WS_OP(VOID, , snapshot, (vtc_ws_snapshot = WS_Snapshot(ws)))
+VTC_WS_OP(VOID, , reset, WS_Reset(ws, vtc_ws_snapshot))
+VTC_WS_OP(VOID, , overflow, WS_MarkOverflow(ws))
+VTC_WS_OP(BOOL, (0), overflowed, return (WS_Overflowed(ws)))
 #undef VTC_WS_OP
 
 /*--------------------------------------------------------------------*/

From phk at FreeBSD.org  Thu Nov  2 12:02:25 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Thu,  2 Nov 2017 12:02:25 +0000 (UTC)
Subject: [master] cc49731 Fix comparison
Message-ID: <20171102120225.951DEA79A7@lists.varnish-cache.org>


commit cc497311fb900fd8ad505c716876c6231b9d5c23
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Nov 2 07:44:54 2017 +0000

    Fix comparison

diff --git a/lib/libvmod_blob/url.c b/lib/libvmod_blob/url.c
index deb7355..7babb18 100644
--- a/lib/libvmod_blob/url.c
+++ b/lib/libvmod_blob/url.c
@@ -127,7 +127,7 @@ url_decode(const enum encoding dec, char *restrict const buf,
 	AN(buf);
 	assert(dec == URL);
 
-	if (n >= 0 && n < len)
+	if (n >= 0 && (size_t)n < len)
 		len = n;
 
 	for (const char *s = p; len > 0 && s != vrt_magic_string_end;

From dridi at varni.sh  Thu Nov  2 12:09:36 2017
From: dridi at varni.sh (Dridi Boukelmoune)
Date: Thu, 2 Nov 2017 13:09:36 +0100
Subject: [master] f4d0280 Return early on failure
In-Reply-To: <20171102120225.6F226A79A4@lists.varnish-cache.org>
References: <20171102120225.6F226A79A4@lists.varnish-cache.org>
Message-ID: <CABoVN9Aeoe_XOfa84-Bif-71O4CV+KWq8gvSM=FbVwTekiQacQ@mail.gmail.com>

On Thu, Nov 2, 2017 at 1:02 PM, Poul-Henning Kamp <phk at freebsd.org> wrote:
>
> commit f4d02803c5dfded27b446d39039dc02f02b3717c
> Author: Poul-Henning Kamp <phk at FreeBSD.org>
> Date:   Thu Nov 2 07:44:16 2017 +0000
>
>     Return early on failure

You might want to VRT_fail before returning too.

Dridi

From nils.goroll at uplex.de  Thu Nov  2 13:12:06 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Thu,  2 Nov 2017 13:12:06 +0000 (UTC)
Subject: [master] 6155df1 cleanup
Message-ID: <20171102131206.DB28EA754F@lists.varnish-cache.org>


commit 6155df1eee573bd7325d9155084d40e858530021
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Thu Nov 2 14:10:26 2017 +0100

    cleanup

diff --git a/bin/varnishd/cache/cache_vrt.c b/bin/varnishd/cache/cache_vrt.c
index 7f95ccb..b975485 100644
--- a/bin/varnishd/cache/cache_vrt.c
+++ b/bin/varnishd/cache/cache_vrt.c
@@ -547,7 +547,7 @@ VRT_purge(VRT_CTX, double ttl, double grace, double keep)
 
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
 
-	if (ctx->method != VCL_MET_HIT && ctx->method != VCL_MET_MISS) {
+	if ((ctx->method & (VCL_MET_HIT|VCL_MET_MISS)) == 0) {
 		VSLb(ctx->vsl, SLT_VCL_Error,
 		    "purge can only happen in vcl_hit{} or vcl_miss{}");
 		VRT_handling(ctx, VCL_RET_FAIL);

From nils.goroll at uplex.de  Thu Nov  2 13:51:06 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Thu,  2 Nov 2017 13:51:06 +0000 (UTC)
Subject: [master] 2e5f359 convenience masks for checking ctx->method against
 task
Message-ID: <20171102135106.EB941A72A2@lists.varnish-cache.org>


commit 2e5f359858176b0ce6b14ea8a7daf4b487c1b1d8
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Thu Nov 2 14:47:12 2017 +0100

    convenience masks for checking ctx->method against task

diff --git a/lib/libvcc/generate.py b/lib/libvcc/generate.py
index d1c7dd4..2ff3857 100755
--- a/lib/libvcc/generate.py
+++ b/lib/libvcc/generate.py
@@ -1125,14 +1125,23 @@ def tbl40(a, b):
 	return a + b
 
 fo.write("\n/* VCL Methods */\n")
+task = {}
 n = 1
 for i in returns:
 	fo.write(tbl40("#define VCL_MET_%s" % i[0].upper(), "(1U << %d)\n" % n))
+	if not i[1] in task:
+		task[i[1]] = []
+	task[i[1]].append("VCL_MET_" + i[0].upper())
 	n += 1
 
 fo.write("\n" + tbl40("#define VCL_MET_MAX", "%d\n" % n))
 fo.write("\n" + tbl40("#define VCL_MET_MASK", "0x%x\n" % ((1 << n) - 1)))
 
+fo.write("\n")
+for i in sorted(task.keys()):
+	fo.write(tbl40("#define VCL_MET_TASK_%s" % i.upper(),
+		       "( " + (" | \\\n%42s" % "").join(task[i]) + " )\n"))
+
 
 fo.write("\n/* VCL Returns */\n")
 n = 1

From phk at FreeBSD.org  Thu Nov  2 15:06:07 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Thu,  2 Nov 2017 15:06:07 +0000 (UTC)
Subject: [master] 8aa382f Flexelinting
Message-ID: <20171102150607.BEA46A7B45@lists.varnish-cache.org>


commit 8aa382fe436c0fe9e120c69201b4c3b6899b301f
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Nov 2 15:04:07 2017 +0000

    Flexelinting

diff --git a/lib/libvmod_blob/hex.c b/lib/libvmod_blob/hex.c
index b65b07e..4124100 100644
--- a/lib/libvmod_blob/hex.c
+++ b/lib/libvmod_blob/hex.c
@@ -106,6 +106,7 @@ hex_decode(const enum encoding dec, char *restrict const buf,
 	   const char *restrict const p, va_list ap)
 {
 	char *dest = buf;
+	const char *b;
 	unsigned char extranib = 0;
 	ssize_t len = 0;
 	va_list ap2;
@@ -116,13 +117,15 @@ hex_decode(const enum encoding dec, char *restrict const buf,
 	va_copy(ap2, ap);
 	for (const char *s = p; s != vrt_magic_string_end;
 	     s = va_arg(ap2, const char *)) {
-		const char *b = s;
-		if (s != NULL)
-			while (*s)
-				if (!isxdigit(*s++)) {
-					len = -1;
-					break;
-				}
+		if (s == NULL)
+			continue;
+		b = s;
+		while (*s) {
+			if (!isxdigit(*s++)) {
+				len = -1;
+				break;
+			}
+		}
 		if (len == -1)
 			break;
 		len += s - b;

From phk at FreeBSD.org  Thu Nov  2 15:45:08 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Thu,  2 Nov 2017 15:45:08 +0000 (UTC)
Subject: [master] 7180e00 A little bit of vmod coverage
Message-ID: <20171102154508.85958A7840@lists.varnish-cache.org>


commit 7180e001171df9c74e678ddd61ea24043c3e950e
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Nov 2 15:44:21 2017 +0000

    A little bit of vmod coverage

diff --git a/bin/varnishtest/tests/m00000.vtc b/bin/varnishtest/tests/m00000.vtc
index 57749aa..2dbe456 100644
--- a/bin/varnishtest/tests/m00000.vtc
+++ b/bin/varnishtest/tests/m00000.vtc
@@ -1,4 +1,4 @@
-varnishtest "Test std & debug vmod"
+varnishtest "Test std, vtc & debug vmod"
 
 server s1 {
 	rxreq
@@ -9,6 +9,7 @@ server s1 {
 varnish v1 -vcl+backend {
 	import std;
 	import debug;
+	import vtc;
 
 	sub vcl_init {
 		new obj = debug.obj();
@@ -22,6 +23,7 @@ varnish v1 -vcl+backend {
 		set resp.http.foo = std.toupper(resp.http.foo);
 		set resp.http.bar = std.tolower(resp.http.bar);
 		set resp.http.who = debug.author(phk);
+		set resp.http.what = vtc.typesize("dfijlopsz");
 		debug.test_priv_call();
 		debug.test_priv_vcl();
 		obj.test_priv_call();
@@ -40,6 +42,7 @@ client c1 {
 	expect resp.http.foo == "BAR"
 	expect resp.http.bar == "foo"
 	expect resp.http.encrypted == "ROT52"
+	expect resp.http.what >= 16
 } -run
 
 logexpect l1 -v v1 -g raw -d 1 {
@@ -49,6 +52,7 @@ logexpect l1 -v v1 -g raw -d 1 {
 	expect 0 =    RespUnset	{^bar: fOo}
 	expect 0 =    RespHeader	{^bar: foo}
 	expect 0 =    RespHeader	{^who: Poul-Henning}
+	expect 0 =    RespHeader	{^what: [1-9][0-9]}
 	expect 0 =    VCL_Log		{^VCL initiated log}
 	expect 0 =    RespHeader	{^Encrypted: ROT52}
 	expect 0 =    VCL_return	{^deliver}
diff --git a/bin/varnishtest/vtc_varnish.c b/bin/varnishtest/vtc_varnish.c
index 5a5951a..b2daae7 100644
--- a/bin/varnishtest/vtc_varnish.c
+++ b/bin/varnishtest/vtc_varnish.c
@@ -952,6 +952,7 @@ varnish_expect(const struct varnish *v, char * const *av)
 		    av[0], (uintmax_t)sp.val, av[1], av[2], (uintmax_t)ref);
 	}
 }
+
 /* SECTION: varnish varnish
  *
  * Define and interact with varnish instances.

From fgsch at lodoss.net  Fri Nov  3 02:19:40 2017
From: fgsch at lodoss.net (Federico Schwindt)
Date: Fri, 3 Nov 2017 11:19:40 +0900
Subject: [master] 6155df1 cleanup
In-Reply-To: <20171102131206.DB28EA754F@lists.varnish-cache.org>
References: <20171102131206.DB28EA754F@lists.varnish-cache.org>
Message-ID: <CAJV_h0bytW8x-xvjqnRDMDakdRSEAFSkby9rZghJBb95nRP3dQ@mail.gmail.com>

ctx->method is not a bit mask. This change makes it look like it is.
Why are we changing this?

On Thu, Nov 2, 2017 at 10:12 PM, Nils Goroll <nils.goroll at uplex.de> wrote:

>
> commit 6155df1eee573bd7325d9155084d40e858530021
> Author: Nils Goroll <nils.goroll at uplex.de>
> Date:   Thu Nov 2 14:10:26 2017 +0100
>
>     cleanup
>
> diff --git a/bin/varnishd/cache/cache_vrt.c b/bin/varnishd/cache/cache_
> vrt.c
> index 7f95ccb..b975485 100644
> --- a/bin/varnishd/cache/cache_vrt.c
> +++ b/bin/varnishd/cache/cache_vrt.c
> @@ -547,7 +547,7 @@ VRT_purge(VRT_CTX, double ttl, double grace, double
> keep)
>
>         CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
>
> -       if (ctx->method != VCL_MET_HIT && ctx->method != VCL_MET_MISS) {
> +       if ((ctx->method & (VCL_MET_HIT|VCL_MET_MISS)) == 0) {
>                 VSLb(ctx->vsl, SLT_VCL_Error,
>                     "purge can only happen in vcl_hit{} or vcl_miss{}");
>                 VRT_handling(ctx, VCL_RET_FAIL);
> _______________________________________________
> varnish-commit mailing list
> varnish-commit at varnish-cache.org
> https://www.varnish-cache.org/lists/mailman/listinfo/varnish-commit
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://www.varnish-cache.org/lists/pipermail/varnish-commit/attachments/20171103/63172e71/attachment.html>

From fgsch at lodoss.net  Fri Nov  3 02:23:22 2017
From: fgsch at lodoss.net (Federico Schwindt)
Date: Fri, 3 Nov 2017 11:23:22 +0900
Subject: [master] 7cdb71a Use $Prefix to avoid symbol clashes with
 libvmod_vtc
In-Reply-To: <20171102120225.3503FA799E@lists.varnish-cache.org>
References: <20171102120225.3503FA799E@lists.varnish-cache.org>
Message-ID: <CAJV_h0bgPFeO5BuwBBsur3GTi8BBeSvcNRuftfUn_kPuira-Ug@mail.gmail.com>

Wasn't the plan to remove this after the release?

On Thu, Nov 2, 2017 at 9:02 PM, Poul-Henning Kamp <phk at freebsd.org> wrote:

>
> commit 7cdb71aa00444001f58cd3828282bf627ff39b80
> Author: Poul-Henning Kamp <phk at FreeBSD.org>
> Date:   Thu Nov 2 07:16:10 2017 +0000
>
>     Use $Prefix to avoid symbol clashes with libvmod_vtc
>
> diff --git a/lib/libvmod_debug/vmod.vcc b/lib/libvmod_debug/vmod.vcc
> index 324d389..b33e0d9 100644
> --- a/lib/libvmod_debug/vmod.vcc
> +++ b/lib/libvmod_debug/vmod.vcc
> @@ -27,6 +27,7 @@
>
>  $Module debug 3 Development, test and debug
>  $ABI strict
> +$Prefix xyzzy
>
>  DESCRIPTION
>  ===========
> diff --git a/lib/libvmod_debug/vmod_debug.c b/lib/libvmod_debug/vmod_
> debug.c
> index 6b0586d..74718e7 100644
> --- a/lib/libvmod_debug/vmod_debug.c
> +++ b/lib/libvmod_debug/vmod_debug.c
> @@ -65,7 +65,7 @@ struct priv_vcl {
>  static VCL_DURATION vcl_release_delay = 0.0;
>
>  VCL_VOID __match_proto__(td_debug_panic)
> -vmod_panic(VRT_CTX, const char *str, ...)
> +xyzzy_panic(VRT_CTX, const char *str, ...)
>  {
>         va_list ap;
>         const char *b;
> @@ -79,7 +79,7 @@ vmod_panic(VRT_CTX, const char *str, ...)
>  }
>
>  VCL_STRING __match_proto__(td_debug_author)
> -vmod_author(VRT_CTX, VCL_ENUM person, VCL_ENUM someone)
> +xyzzy_author(VRT_CTX, VCL_ENUM person, VCL_ENUM someone)
>  {
>         (void)someone;
>
> @@ -96,7 +96,7 @@ vmod_author(VRT_CTX, VCL_ENUM person, VCL_ENUM someone)
>  }
>
>  VCL_VOID __match_proto__(td_debug_test_priv_call)
> -vmod_test_priv_call(VRT_CTX, struct vmod_priv *priv)
> +xyzzy_test_priv_call(VRT_CTX, struct vmod_priv *priv)
>  {
>
>         CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
> @@ -109,7 +109,7 @@ vmod_test_priv_call(VRT_CTX, struct vmod_priv *priv)
>  }
>
>  VCL_STRING __match_proto__(td_debug_test_priv_task)
> -vmod_test_priv_task(VRT_CTX, struct vmod_priv *priv, VCL_STRING s)
> +xyzzy_test_priv_task(VRT_CTX, struct vmod_priv *priv, VCL_STRING s)
>  {
>
>         CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
> @@ -131,7 +131,7 @@ vmod_test_priv_task(VRT_CTX, struct vmod_priv *priv,
> VCL_STRING s)
>  }
>
>  VCL_STRING __match_proto__(td_debug_test_priv_top)
> -vmod_test_priv_top(VRT_CTX, struct vmod_priv *priv, VCL_STRING s)
> +xyzzy_test_priv_top(VRT_CTX, struct vmod_priv *priv, VCL_STRING s)
>  {
>
>         CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
> @@ -143,7 +143,7 @@ vmod_test_priv_top(VRT_CTX, struct vmod_priv *priv,
> VCL_STRING s)
>  }
>
>  VCL_VOID __match_proto__(td_debug_test_priv_vcl)
> -vmod_test_priv_vcl(VRT_CTX, struct vmod_priv *priv)
> +xyzzy_test_priv_vcl(VRT_CTX, struct vmod_priv *priv)
>  {
>         struct priv_vcl *priv_vcl;
>
> @@ -155,7 +155,7 @@ vmod_test_priv_vcl(VRT_CTX, struct vmod_priv *priv)
>  }
>
>  VCL_BACKEND
> -vmod_no_backend(VRT_CTX)
> +xyzzy_no_backend(VRT_CTX)
>  {
>
>         CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
> @@ -164,7 +164,7 @@ vmod_no_backend(VRT_CTX)
>  }
>
>  VCL_STEVEDORE __match_proto__(td_debug_no_stevedore)
> -vmod_no_stevedore(VRT_CTX)
> +xyzzy_no_stevedore(VRT_CTX)
>  {
>
>         CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
> @@ -173,7 +173,7 @@ vmod_no_stevedore(VRT_CTX)
>  }
>
>  VCL_VOID __match_proto__(td_debug_rot52)
> -vmod_rot52(VRT_CTX, VCL_HTTP hp)
> +xyzzy_rot52(VRT_CTX, VCL_HTTP hp)
>  {
>
>         CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
> @@ -183,7 +183,7 @@ vmod_rot52(VRT_CTX, VCL_HTTP hp)
>  }
>
>  VCL_STRING __match_proto__(td_debug_argtest)
> -vmod_argtest(VRT_CTX, VCL_STRING one, VCL_REAL two, VCL_STRING three,
> +xyzzy_argtest(VRT_CTX, VCL_STRING one, VCL_REAL two, VCL_STRING three,
>      VCL_STRING comma, VCL_INT four)
>  {
>         char buf[100];
> @@ -193,7 +193,7 @@ vmod_argtest(VRT_CTX, VCL_STRING one, VCL_REAL two,
> VCL_STRING three,
>  }
>
>  VCL_INT __match_proto__(td_debug_vre_limit)
> -vmod_vre_limit(VRT_CTX)
> +xyzzy_vre_limit(VRT_CTX)
>  {
>         (void)ctx;
>         return (cache_param->vre_limits.match);
> @@ -220,7 +220,7 @@ obj_cb(struct worker *wrk, void *priv, struct objcore
> *oc, unsigned event)
>  }
>
>  VCL_VOID __match_proto__(td_debug_register_obj_events)
> -vmod_register_obj_events(VRT_CTX, struct vmod_priv *priv)
> +xyzzy_register_obj_events(VRT_CTX, struct vmod_priv *priv)
>  {
>         struct priv_vcl *priv_vcl;
>
> @@ -233,7 +233,7 @@ vmod_register_obj_events(VRT_CTX, struct vmod_priv
> *priv)
>  }
>
>  VCL_VOID __match_proto__(td_debug_fail)
> -vmod_fail(VRT_CTX)
> +xyzzy_fail(VRT_CTX)
>  {
>
>         VRT_fail(ctx, "Forced failure");
> @@ -356,7 +356,7 @@ event_function(VRT_CTX, struct vmod_priv *priv, enum
> vcl_event_e e)
>  }
>
>  VCL_VOID __match_proto__(td_debug_sleep)
> -vmod_sleep(VRT_CTX, VCL_DURATION t)
> +xyzzy_sleep(VRT_CTX, VCL_DURATION t)
>  {
>
>         CHECK_OBJ_ORNULL(ctx, VRT_CTX_MAGIC);
> @@ -380,7 +380,7 @@ wsfind(VRT_CTX, VCL_ENUM which)
>  }
>
>  void
> -vmod_workspace_allocate(VRT_CTX, VCL_ENUM which, VCL_INT size)
> +xyzzy_workspace_allocate(VRT_CTX, VCL_ENUM which, VCL_INT size)
>  {
>         struct ws *ws;
>         char *s;
> @@ -407,7 +407,7 @@ vmod_workspace_allocate(VRT_CTX, VCL_ENUM which,
> VCL_INT size)
>  }
>
>  VCL_INT
> -vmod_workspace_free(VRT_CTX, VCL_ENUM which)
> +xyzzy_workspace_free(VRT_CTX, VCL_ENUM which)
>  {
>         struct ws *ws;
>         unsigned u;
> @@ -425,7 +425,7 @@ vmod_workspace_free(VRT_CTX, VCL_ENUM which)
>  }
>
>  VCL_BOOL
> -vmod_workspace_overflowed(VRT_CTX, VCL_ENUM which)
> +xyzzy_workspace_overflowed(VRT_CTX, VCL_ENUM which)
>  {
>         struct ws *ws;
>         CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
> @@ -440,7 +440,7 @@ vmod_workspace_overflowed(VRT_CTX, VCL_ENUM which)
>  static uintptr_t debug_ws_snap;
>
>  void
> -vmod_workspace_snap(VRT_CTX, VCL_ENUM which)
> +xyzzy_workspace_snap(VRT_CTX, VCL_ENUM which)
>  {
>         struct ws *ws;
>         CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
> @@ -453,7 +453,7 @@ vmod_workspace_snap(VRT_CTX, VCL_ENUM which)
>  }
>
>  void
> -vmod_workspace_reset(VRT_CTX, VCL_ENUM which)
> +xyzzy_workspace_reset(VRT_CTX, VCL_ENUM which)
>  {
>         struct ws *ws;
>         CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
> @@ -466,7 +466,7 @@ vmod_workspace_reset(VRT_CTX, VCL_ENUM which)
>  }
>
>  void
> -vmod_workspace_overflow(VRT_CTX, VCL_ENUM which)
> +xyzzy_workspace_overflow(VRT_CTX, VCL_ENUM which)
>  {
>         struct ws *ws;
>         CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
> @@ -479,7 +479,7 @@ vmod_workspace_overflow(VRT_CTX, VCL_ENUM which)
>  }
>
>  VCL_VOID __match_proto__(td_debug_vcl_release_delay)
> -vmod_vcl_release_delay(VRT_CTX, VCL_DURATION delay)
> +xyzzy_vcl_release_delay(VRT_CTX, VCL_DURATION delay)
>  {
>
>         CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
> @@ -488,7 +488,7 @@ vmod_vcl_release_delay(VRT_CTX, VCL_DURATION delay)
>  }
>
>  VCL_BOOL __match_proto__(td_debug_match_acl)
> -vmod_match_acl(VRT_CTX, VCL_ACL acl, VCL_IP ip)
> +xyzzy_match_acl(VRT_CTX, VCL_ACL acl, VCL_IP ip)
>  {
>
>         CHECK_OBJ_ORNULL(ctx, VRT_CTX_MAGIC);
> @@ -499,7 +499,7 @@ vmod_match_acl(VRT_CTX, VCL_ACL acl, VCL_IP ip)
>  }
>
>  VCL_BOOL
> -vmod_barrier_sync(VRT_CTX, VCL_STRING addr)
> +xyzzy_barrier_sync(VRT_CTX, VCL_STRING addr)
>  {
>         const char *err;
>         char buf[32];
> @@ -532,7 +532,7 @@ vmod_barrier_sync(VRT_CTX, VCL_STRING addr)
>  }
>
>  VCL_VOID __match_proto__(td_debug_test_probe)
> -vmod_test_probe(VRT_CTX, VCL_PROBE probe, VCL_PROBE same)
> +xyzzy_test_probe(VRT_CTX, VCL_PROBE probe, VCL_PROBE same)
>  {
>
>         CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
> @@ -542,7 +542,7 @@ vmod_test_probe(VRT_CTX, VCL_PROBE probe, VCL_PROBE
> same)
>  }
>
>  VCL_INT
> -vmod_typesize(VRT_CTX, VCL_STRING s)
> +xyzzy_typesize(VRT_CTX, VCL_STRING s)
>  {
>         size_t i = 0;
>         const char *p;
> diff --git a/lib/libvmod_debug/vmod_debug_dyn.c b/lib/libvmod_debug/vmod_
> debug_dyn.c
> index 8742ff9..ad2dd29 100644
> --- a/lib/libvmod_debug/vmod_debug_dyn.c
> +++ b/lib/libvmod_debug/vmod_debug_dyn.c
> @@ -39,7 +39,7 @@
>  #include "vsa.h"
>  #include "vcc_if.h"
>
> -struct vmod_debug_dyn {
> +struct xyzzy_debug_dyn {
>         unsigned                magic;
>  #define VMOD_DEBUG_DYN_MAGIC   0x9b77ccbd
>         pthread_mutex_t         mtx;
> @@ -48,7 +48,7 @@ struct vmod_debug_dyn {
>  };
>
>  static void
> -dyn_dir_init(VRT_CTX, struct vmod_debug_dyn *dyn,
> +dyn_dir_init(VRT_CTX, struct xyzzy_debug_dyn *dyn,
>      VCL_STRING addr, VCL_STRING port)
>  {
>         struct addrinfo hints, *res = NULL;
> @@ -104,10 +104,10 @@ dyn_dir_init(VRT_CTX, struct vmod_debug_dyn *dyn,
>  }
>
>  VCL_VOID
> -vmod_dyn__init(VRT_CTX, struct vmod_debug_dyn **dynp,
> +xyzzy_dyn__init(VRT_CTX, struct xyzzy_debug_dyn **dynp,
>      const char *vcl_name, VCL_STRING addr, VCL_STRING port)
>  {
> -       struct vmod_debug_dyn *dyn;
> +       struct xyzzy_debug_dyn *dyn;
>
>         ASSERT_CLI();
>         CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
> @@ -134,9 +134,9 @@ vmod_dyn__init(VRT_CTX, struct vmod_debug_dyn **dynp,
>  }
>
>  VCL_VOID
> -vmod_dyn__fini(struct vmod_debug_dyn **dynp)
> +xyzzy_dyn__fini(struct xyzzy_debug_dyn **dynp)
>  {
> -       struct vmod_debug_dyn *dyn;
> +       struct xyzzy_debug_dyn *dyn;
>
>         AN(dynp);
>         if (*dynp == NULL)
> @@ -151,7 +151,7 @@ vmod_dyn__fini(struct vmod_debug_dyn **dynp)
>  }
>
>  VCL_BACKEND __match_proto__()
> -vmod_dyn_backend(VRT_CTX, struct vmod_debug_dyn *dyn)
> +xyzzy_dyn_backend(VRT_CTX, struct xyzzy_debug_dyn *dyn)
>  {
>         CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
>         CHECK_OBJ_NOTNULL(dyn, VMOD_DEBUG_DYN_MAGIC);
> @@ -160,7 +160,7 @@ vmod_dyn_backend(VRT_CTX, struct vmod_debug_dyn *dyn)
>  }
>
>  VCL_VOID
> -vmod_dyn_refresh(VRT_CTX, struct vmod_debug_dyn *dyn,
> +xyzzy_dyn_refresh(VRT_CTX, struct xyzzy_debug_dyn *dyn,
>      VCL_STRING addr, VCL_STRING port)
>  {
>         CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
> diff --git a/lib/libvmod_debug/vmod_debug_obj.c b/lib/libvmod_debug/vmod_
> debug_obj.c
> index 3364092..63f2e44 100644
> --- a/lib/libvmod_debug/vmod_debug_obj.c
> +++ b/lib/libvmod_debug/vmod_debug_obj.c
> @@ -35,7 +35,7 @@
>
>  #include "vcc_if.h"
>
> -struct vmod_debug_obj {
> +struct xyzzy_debug_obj {
>         unsigned                magic;
>  #define VMOD_DEBUG_OBJ_MAGIC   0xccbd9b77
>         int foobar;
> @@ -43,10 +43,10 @@ struct vmod_debug_obj {
>  };
>
>  VCL_VOID
> -vmod_obj__init(VRT_CTX, struct vmod_debug_obj **op,
> +xyzzy_obj__init(VRT_CTX, struct xyzzy_debug_obj **op,
>      const char *vcl_name, VCL_STRING s, VCL_ENUM e)
>  {
> -       struct vmod_debug_obj *o;
> +       struct xyzzy_debug_obj *o;
>
>         CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
>         (void)vcl_name;
> @@ -62,7 +62,7 @@ vmod_obj__init(VRT_CTX, struct vmod_debug_obj **op,
>  }
>
>  VCL_VOID
> -vmod_obj__fini(struct vmod_debug_obj **op)
> +xyzzy_obj__fini(struct xyzzy_debug_obj **op)
>  {
>
>         AN(op);
> @@ -72,7 +72,7 @@ vmod_obj__fini(struct vmod_debug_obj **op)
>  }
>
>  VCL_VOID __match_proto__()
> -vmod_obj_enum(VRT_CTX, struct vmod_debug_obj *o, VCL_ENUM e)
> +xyzzy_obj_enum(VRT_CTX, struct xyzzy_debug_obj *o, VCL_ENUM e)
>  {
>
>         CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
> @@ -81,7 +81,7 @@ vmod_obj_enum(VRT_CTX, struct vmod_debug_obj *o,
> VCL_ENUM e)
>  }
>
>  VCL_STRING __match_proto__()
> -vmod_obj_foo(VRT_CTX, struct vmod_debug_obj *o, VCL_STRING s)
> +xyzzy_obj_foo(VRT_CTX, struct xyzzy_debug_obj *o, VCL_STRING s)
>  {
>
>         CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
> @@ -92,7 +92,7 @@ vmod_obj_foo(VRT_CTX, struct vmod_debug_obj *o,
> VCL_STRING s)
>  }
>
>  VCL_TIME __match_proto__()
> -vmod_obj_date(VRT_CTX, struct vmod_debug_obj *o)
> +xyzzy_obj_date(VRT_CTX, struct xyzzy_debug_obj *o)
>  {
>
>         CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
> @@ -102,7 +102,7 @@ vmod_obj_date(VRT_CTX, struct vmod_debug_obj *o)
>  }
>
>  VCL_STRING __match_proto__()
> -vmod_obj_string(VRT_CTX, struct vmod_debug_obj *o)
> +xyzzy_obj_string(VRT_CTX, struct xyzzy_debug_obj *o)
>  {
>
>         CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
> @@ -112,7 +112,7 @@ vmod_obj_string(VRT_CTX, struct vmod_debug_obj *o)
>  }
>
>  VCL_STRING __match_proto__()
> -vmod_obj_number(VRT_CTX, struct vmod_debug_obj *o)
> +xyzzy_obj_number(VRT_CTX, struct xyzzy_debug_obj *o)
>  {
>
>         CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
> @@ -122,30 +122,30 @@ vmod_obj_number(VRT_CTX, struct vmod_debug_obj *o)
>  }
>
>  VCL_VOID __match_proto__()
> -vmod_obj_test_priv_call(VRT_CTX,
> -    struct vmod_debug_obj *o, struct vmod_priv *priv)
> +xyzzy_obj_test_priv_call(VRT_CTX,
> +    struct xyzzy_debug_obj *o, struct vmod_priv *priv)
>  {
>         (void)o;
> -       vmod_test_priv_call(ctx, priv);
> +       xyzzy_test_priv_call(ctx, priv);
>  }
>  VCL_VOID __match_proto__()
> -vmod_obj_test_priv_vcl(VRT_CTX,
> -    struct vmod_debug_obj *o, struct vmod_priv *priv)
> +xyzzy_obj_test_priv_vcl(VRT_CTX,
> +    struct xyzzy_debug_obj *o, struct vmod_priv *priv)
>  {
>         (void)o;
> -       vmod_test_priv_vcl(ctx, priv);
> +       xyzzy_test_priv_vcl(ctx, priv);
>  }
>  VCL_STRING __match_proto__()
> -vmod_obj_test_priv_task(VRT_CTX,
> -    struct vmod_debug_obj *o, struct vmod_priv *priv, VCL_STRING s)
> +xyzzy_obj_test_priv_task(VRT_CTX,
> +    struct xyzzy_debug_obj *o, struct vmod_priv *priv, VCL_STRING s)
>  {
>         (void)o;
> -       return (vmod_test_priv_task(ctx, priv, s));
> +       return (xyzzy_test_priv_task(ctx, priv, s));
>  }
>  VCL_STRING __match_proto__()
> -vmod_obj_test_priv_top(VRT_CTX,
> -    struct vmod_debug_obj *o, struct vmod_priv *priv, VCL_STRING s)
> +xyzzy_obj_test_priv_top(VRT_CTX,
> +    struct xyzzy_debug_obj *o, struct vmod_priv *priv, VCL_STRING s)
>  {
>         (void)o;
> -       return (vmod_test_priv_top(ctx, priv, s));
> +       return (xyzzy_test_priv_top(ctx, priv, s));
>  }
> _______________________________________________
> varnish-commit mailing list
> varnish-commit at varnish-cache.org
> https://www.varnish-cache.org/lists/mailman/listinfo/varnish-commit
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://www.varnish-cache.org/lists/pipermail/varnish-commit/attachments/20171103/9e0d6b6c/attachment-0001.html>

From phk at phk.freebsd.dk  Fri Nov  3 06:56:47 2017
From: phk at phk.freebsd.dk (Poul-Henning Kamp)
Date: Fri, 03 Nov 2017 06:56:47 +0000
Subject: [master] 7cdb71a Use $Prefix to avoid symbol clashes with
 libvmod_vtc
In-Reply-To: <CAJV_h0bgPFeO5BuwBBsur3GTi8BBeSvcNRuftfUn_kPuira-Ug@mail.gmail.com>
References: <20171102120225.3503FA799E@lists.varnish-cache.org>
 <CAJV_h0bgPFeO5BuwBBsur3GTi8BBeSvcNRuftfUn_kPuira-Ug@mail.gmail.com>
Message-ID: <80757.1509692207@critter.freebsd.dk>

--------
In message <CAJV_h0bgPFeO5BuwBBsur3GTi8BBeSvcNRuftfUn_kPuira-Ug at mail.gmail.com>
, Federico Schwindt writes:

>Wasn't the plan to remove this after the release?

You mean the functions moved to vmod_vtc ?  Yes.

But I still think the "vmod_" prefix should be overridable.

-- 
Poul-Henning Kamp       | UNIX since Zilog Zeus 3.20
phk at FreeBSD.ORG         | TCP/IP since RFC 956
FreeBSD committer       | BSD since 4.3-tahoe    
Never attribute to malice what can adequately be explained by incompetence.

From nils.goroll at uplex.de  Fri Nov  3 07:37:17 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Fri, 3 Nov 2017 08:37:17 +0100
Subject: [master] 6155df1 cleanup
In-Reply-To: <CAJV_h0bytW8x-xvjqnRDMDakdRSEAFSkby9rZghJBb95nRP3dQ@mail.gmail.com>
References: <20171102131206.DB28EA754F@lists.varnish-cache.org>
 <CAJV_h0bytW8x-xvjqnRDMDakdRSEAFSkby9rZghJBb95nRP3dQ@mail.gmail.com>
Message-ID: <1c6920e5-8979-b317-f7d2-ec512105783c@uplex.de>

On 03/11/17 03:19, Federico Schwindt wrote:
> ctx->method is not a bit mask.

have a look at vcl.h

-- 

** * * UPLEX - Nils Goroll Systemoptimierung

Scheffelstra?e 32
22301 Hamburg

tel +49 40 28805731
mob +49 170 2723133
fax +49 40 42949753

xmpp://slink at jabber.int.uplex.de/

http://uplex.de/

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: OpenPGP digital signature
URL: <https://www.varnish-cache.org/lists/pipermail/varnish-commit/attachments/20171103/7702d591/attachment.bin>

From fgsch at lodoss.net  Fri Nov  3 09:25:53 2017
From: fgsch at lodoss.net (Federico Schwindt)
Date: Fri, 3 Nov 2017 18:25:53 +0900
Subject: [master] 6155df1 cleanup
In-Reply-To: <1c6920e5-8979-b317-f7d2-ec512105783c@uplex.de>
References: <20171102131206.DB28EA754F@lists.varnish-cache.org>
 <CAJV_h0bytW8x-xvjqnRDMDakdRSEAFSkby9rZghJBb95nRP3dQ@mail.gmail.com>
 <1c6920e5-8979-b317-f7d2-ec512105783c@uplex.de>
Message-ID: <CAJV_h0biE8yvN1cn+7PvXwu-+Ao1oxdNC-ShoUu_fx2jCfYiRQ@mail.gmail.com>

Only in the context of vcc but you are correct though I don't agree with
this change.

On Fri, Nov 3, 2017 at 4:37 PM, Nils Goroll <nils.goroll at uplex.de> wrote:

> On 03/11/17 03:19, Federico Schwindt wrote:
> > ctx->method is not a bit mask.
>
> have a look at vcl.h
>
> --
>
> ** * * UPLEX - Nils Goroll Systemoptimierung
>
> Scheffelstra?e 32
> 22301 Hamburg
>
> tel +49 40 28805731
> mob +49 170 2723133
> fax +49 40 42949753
>
> xmpp://slink at jabber.int.uplex.de/
>
> http://uplex.de/
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://www.varnish-cache.org/lists/pipermail/varnish-commit/attachments/20171103/b9e84835/attachment.html>

From fgsch at lodoss.net  Fri Nov  3 09:31:01 2017
From: fgsch at lodoss.net (Federico Schwindt)
Date: Fri, 3 Nov 2017 18:31:01 +0900
Subject: [master] 7cdb71a Use $Prefix to avoid symbol clashes with
 libvmod_vtc
In-Reply-To: <80757.1509692207@critter.freebsd.dk>
References: <20171102120225.3503FA799E@lists.varnish-cache.org>
 <CAJV_h0bgPFeO5BuwBBsur3GTi8BBeSvcNRuftfUn_kPuira-Ug@mail.gmail.com>
 <80757.1509692207@critter.freebsd.dk>
Message-ID: <CAJV_h0b1gE=QZMxk+BL3gq87pxSaA8j+V0_oW6vMwjhyT=GUHw@mail.gmail.com>

Ok, I didn't know we wanted to make that overridable.

On Fri, Nov 3, 2017 at 3:56 PM, Poul-Henning Kamp <phk at phk.freebsd.dk>
wrote:

> --------
> In message <CAJV_h0bgPFeO5BuwBBsur3GTi8BBeSvcNR
> uftfUn_kPuira-Ug at mail.gmail.com>
> , Federico Schwindt writes:
>
> >Wasn't the plan to remove this after the release?
>
> You mean the functions moved to vmod_vtc ?  Yes.
>
> But I still think the "vmod_" prefix should be overridable.
>
> --
> Poul-Henning Kamp       | UNIX since Zilog Zeus 3.20
> phk at FreeBSD.ORG         | TCP/IP since RFC 956
> FreeBSD committer       | BSD since 4.3-tahoe
> Never attribute to malice what can adequately be explained by incompetence.
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://www.varnish-cache.org/lists/pipermail/varnish-commit/attachments/20171103/d3dbf3f5/attachment.html>

From phk at phk.freebsd.dk  Fri Nov  3 07:24:58 2017
From: phk at phk.freebsd.dk (Poul-Henning Kamp)
Date: Fri, 03 Nov 2017 07:24:58 +0000
Subject: [master] f4d0280 Return early on failure
In-Reply-To: <CABoVN9Aeoe_XOfa84-Bif-71O4CV+KWq8gvSM=FbVwTekiQacQ@mail.gmail.com>
References: <20171102120225.6F226A79A4@lists.varnish-cache.org>
 <CABoVN9Aeoe_XOfa84-Bif-71O4CV+KWq8gvSM=FbVwTekiQacQ@mail.gmail.com>
Message-ID: <81794.1509693898@critter.freebsd.dk>

--------
In message <CABoVN9Aeoe_XOfa84-Bif-71O4CV+KWq8gvSM=FbVwTekiQacQ at mail.gmail.com>
, Dridi Boukelmoune writes:
>On Thu, Nov 2, 2017 at 1:02 PM, Poul-Henning Kamp <phk at freebsd.org> wrote:
>>
>> commit f4d02803c5dfded27b446d39039dc02f02b3717c
>> Author: Poul-Henning Kamp <phk at FreeBSD.org>
>> Date:   Thu Nov 2 07:44:16 2017 +0000
>>
>>     Return early on failure
>
>You might want to VRT_fail before returning too.

We do that in vtc_ws_find() in the new functions in vmod_vrt,
but the old (to be removed) functions in vmod_debug never did that.

-- 
Poul-Henning Kamp       | UNIX since Zilog Zeus 3.20
phk at FreeBSD.ORG         | TCP/IP since RFC 956
FreeBSD committer       | BSD since 4.3-tahoe    
Never attribute to malice what can adequately be explained by incompetence.

From dridi at varni.sh  Fri Nov  3 14:24:39 2017
From: dridi at varni.sh (Dridi Boukelmoune)
Date: Fri, 3 Nov 2017 15:24:39 +0100
Subject: [master] f4d0280 Return early on failure
In-Reply-To: <81794.1509693898@critter.freebsd.dk>
References: <20171102120225.6F226A79A4@lists.varnish-cache.org>
 <CABoVN9Aeoe_XOfa84-Bif-71O4CV+KWq8gvSM=FbVwTekiQacQ@mail.gmail.com>
 <81794.1509693898@critter.freebsd.dk>
Message-ID: <CABoVN9C4tR9NxWtzGqzQcWgj8wmM3dhZdAhxSaRJsM9PKpoPDQ@mail.gmail.com>

On Fri, Nov 3, 2017 at 8:24 AM, Poul-Henning Kamp <phk at phk.freebsd.dk> wrote:
> --------
> In message <CABoVN9Aeoe_XOfa84-Bif-71O4CV+KWq8gvSM=FbVwTekiQacQ at mail.gmail.com>
> , Dridi Boukelmoune writes:
>>On Thu, Nov 2, 2017 at 1:02 PM, Poul-Henning Kamp <phk at freebsd.org> wrote:
>>>
>>> commit f4d02803c5dfded27b446d39039dc02f02b3717c
>>> Author: Poul-Henning Kamp <phk at FreeBSD.org>
>>> Date:   Thu Nov 2 07:44:16 2017 +0000
>>>
>>>     Return early on failure
>>
>>You might want to VRT_fail before returning too.
>
> We do that in vtc_ws_find() in the new functions in vmod_vrt,
> but the old (to be removed) functions in vmod_debug never did that.

Indeed, I polished the code for the debug-to-vtc transition, and
apparently I took care of the VRT_fail call but not the early return.
I assumed not since it wasn't in the diff, my bad...

Dridi

From nils.goroll at uplex.de  Sat Nov  4 17:55:11 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Sat,  4 Nov 2017 17:55:11 +0000 (UTC)
Subject: [master] b3f8a26 Stabilize position output for ESI_xmlerror & more
 e8.vtc coverage
Message-ID: <20171104175511.8C34EA6030@lists.varnish-cache.org>


commit b3f8a26e8582f9582f3d2ad33956d245da4c2a46
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Sat Nov 4 15:06:58 2017 +0100

    Stabilize position output for ESI_xmlerror & more e8.vtc coverage
    
    ver_p depends on the amount of data we have read ahead, so it is not
    suitable to get predictable results for ESI testing

diff --git a/bin/varnishd/cache/cache_esi_parse.c b/bin/varnishd/cache/cache_esi_parse.c
index f02a6df..0cef4dd 100644
--- a/bin/varnishd/cache/cache_esi_parse.c
+++ b/bin/varnishd/cache/cache_esi_parse.c
@@ -196,12 +196,9 @@ static struct vep_match vep_match_bom[] = {
 static void
 vep_error(const struct vep_state *vep, const char *p)
 {
-	intmax_t l;
-
 	VSC_C_main->esi_errors++;
-	l = (intmax_t)(vep->ver_p - vep->hack_p);
-	VSLb(vep->vc->wrk->vsl, SLT_ESI_xmlerror, "ERR at %jd %s", l, p);
-
+	VSLb(vep->vc->wrk->vsl, SLT_ESI_xmlerror, "ERR after %zd %s",
+	     vep->o_last, p);
 }
 
 /*--------------------------------------------------------------------
@@ -211,12 +208,9 @@ vep_error(const struct vep_state *vep, const char *p)
 static void
 vep_warn(const struct vep_state *vep, const char *p)
 {
-	intmax_t l;
-
 	VSC_C_main->esi_warnings++;
-	l = (intmax_t)(vep->ver_p - vep->hack_p);
-	VSLb(vep->vc->wrk->vsl, SLT_ESI_xmlerror, "WARN at %jd %s", l, p);
-
+	VSLb(vep->vc->wrk->vsl, SLT_ESI_xmlerror, "WARN after %zd %s",
+	     vep->o_last, p);
 }
 
 /*---------------------------------------------------------------------
diff --git a/bin/varnishtest/tests/e00006.vtc b/bin/varnishtest/tests/e00006.vtc
index 6c9b5fd..95dd08d 100644
--- a/bin/varnishtest/tests/e00006.vtc
+++ b/bin/varnishtest/tests/e00006.vtc
@@ -68,9 +68,11 @@ varnish v1 -vcl+backend {
 varnish v1 -cliok "param.set feature +esi_ignore_https"
 
 logexpect l1 -v v1 -g raw {
-	expect * * ESI_xmlerror "ERR at 35 ESI 1.0 <esi:include> invalid src= URL"
-	expect * * ESI_xmlerror "WARN at 36 ESI 1.0 <esi:include> https:// treated as http://"
-	expect * * ESI_xmlerror "ERR at 36 ESI 1.0 <esi:include> invalid src= URL"
+	expect * * ESI_xmlerror "ERR after 0 ESI 1.0 <esi:include> invalid src= URL"
+	expect * * ESI_xmlerror "WARN after 0 ESI 1.0 <esi:include> https:// treated as http://"
+	expect * * ESI_xmlerror "ERR after 0 ESI 1.0 <esi:include> invalid src= URL"
+
+
 } -start
 
 client c1 {
diff --git a/bin/varnishtest/tests/e00008.vtc b/bin/varnishtest/tests/e00008.vtc
index 51c8c88..8767b73 100644
--- a/bin/varnishtest/tests/e00008.vtc
+++ b/bin/varnishtest/tests/e00008.vtc
@@ -64,6 +64,25 @@ varnish v1 -vcl+backend {
 	}
 } -start
 
+logexpect l1 -v v1 -g vxid {
+	expect * * BereqURL	{^/$}
+	expect * * ESI_xmlerror {^ERR after 134 ESI 1.0 <esi:bogus> element$}
+	expect 0 = ESI_xmlerror {^ERR after 157 ESI 1.0 <esi:comment> needs final '/'$}
+	expect 0 = ESI_xmlerror {^ERR after 192 ESI 1.0 </esi:comment> illegal end-tag$}
+	expect 0 = ESI_xmlerror {^ERR after 251 ESI 1.0 <esi:comment> element nested in <esi:remove>$}
+	expect 0 = ESI_xmlerror {^ERR after 330 ESI 1.0 <esi:remove> already open$}
+	expect 0 = ESI_xmlerror {^ERR after 407 ESI 1.0 <esi:remove> not open$}
+	expect 0 = ESI_xmlerror {^ERR after 442 ESI 1.0 <esi:remove/> not legal$}
+	expect 0 = ESI_xmlerror {^ERR after 474 XML 1.0 Illegal attribute start char$}
+	expect 0 = ESI_xmlerror {^ERR after 525 ESI 1.0 <esi:include> lacks src attr$}
+	expect 0 = ESI_xmlerror {^ERR after 553 XML 1.0 Illegal attr char$}
+	expect 0 = ESI_xmlerror {^ERR after 581 ESI 1.0 <esi:include> lacks src attr$}
+	expect 0 = ESI_xmlerror {^ERR after 608 XML 1.0 Missing end attribute delimiter$}
+	expect 0 = ESI_xmlerror {^ERR after 636 XML 1.0 Illegal attribute delimiter$}
+	expect 0 = ESI_xmlerror {^ERR after 665 ESI 1.0 </esi:include> illegal end-tag$}
+	expect 0 = ESI_xmlerror {^ERR after 767 XML 1.0 Missing end attribute delimiter$}
+}
+
 varnish v1 -cliok "param.set debug +esi_chop"
 
 varnish v1 -cliok "param.set debug +syncvsl"
@@ -75,5 +94,7 @@ client c1 {
 	expect resp.bodylen == 464
 }
 
+logexpect l1 -start
 client c1 -run
+logexpect l1 -wait
 varnish v1 -expect esi_errors == 15

From nils.goroll at uplex.de  Sat Nov  4 17:55:11 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Sat,  4 Nov 2017 17:55:11 +0000 (UTC)
Subject: [master] f1d60c1 ESI vtcs: coverage, fixes, check ESI_xmlerror,
 esi_disable_xml_check
Message-ID: <20171104175511.C5F6DA6033@lists.varnish-cache.org>


commit f1d60c1c7133f72c23bc7992212d8839acf93cf5
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Sat Nov 4 15:09:21 2017 +0100

    ESI vtcs: coverage, fixes, check ESI_xmlerror, esi_disable_xml_check
    
    We were tolerating some unintentional ESI behaviour due to the
    xml check hitting.
    
    We now either avoid running into the xml check or specifically
    test that we are hitting it.
    
    In addition, add some logexpects to tighten checks

diff --git a/bin/varnishtest/tests/e00000.vtc b/bin/varnishtest/tests/e00000.vtc
index e17338f..8448550 100644
--- a/bin/varnishtest/tests/e00000.vtc
+++ b/bin/varnishtest/tests/e00000.vtc
@@ -14,6 +14,10 @@ varnish v1 -vcl+backend {
 	}
 } -start
 
+logexpect l1 -v v1 -g raw {
+	expect * * ESI_xmlerror esi_disable_xml_check
+} -start
+
 client c1 {
 	txreq
 	rxresp
@@ -22,4 +26,5 @@ client c1 {
 }
 
 client c1 -run
+logexpect l1 -wait
 varnish v1 -expect esi_errors == 0
diff --git a/bin/varnishtest/tests/e00001.vtc b/bin/varnishtest/tests/e00001.vtc
index 660637d..be0b0c1 100644
--- a/bin/varnishtest/tests/e00001.vtc
+++ b/bin/varnishtest/tests/e00001.vtc
@@ -19,6 +19,11 @@ varnish v1 -vcl+backend {
 	}
 } -start
 
+logexpect l1 -v v1 -g raw {
+	expect * * ESI_xmlerror {^ERR after 3 ESI 1.0 <esi:include> element nested in <esi:remove>}
+	expect 0 = ESI_xmlerror {^ERR after 3 ESI 1.0 Nested <!--esi element in <esi:remove>}
+} -start
+
 client c1 {
 	txreq
 	rxresp
@@ -27,4 +32,5 @@ client c1 {
 }
 
 client c1 -run
+logexpect l1 -wait
 varnish v1 -expect esi_errors == 2
diff --git a/bin/varnishtest/tests/e00003.vtc b/bin/varnishtest/tests/e00003.vtc
index 0ff09d8..b3e65fa 100644
--- a/bin/varnishtest/tests/e00003.vtc
+++ b/bin/varnishtest/tests/e00003.vtc
@@ -24,7 +24,9 @@ varnish v1 -vcl+backend {
 		}
 	}
 	sub vcl_backend_response {
-		set beresp.do_esi = true;
+		if (bereq.url == "/") {
+			set beresp.do_esi = true;
+		}
 	}
 } -start
 
diff --git a/bin/varnishtest/tests/e00004.vtc b/bin/varnishtest/tests/e00004.vtc
index 7326cb5..9e19b66 100644
--- a/bin/varnishtest/tests/e00004.vtc
+++ b/bin/varnishtest/tests/e00004.vtc
@@ -18,7 +18,9 @@ server s1 {
 
 varnish v1 -vcl+backend {
 	sub vcl_backend_response {
-		set beresp.do_esi = true;
+		if (bereq.url != "/body") {
+			set beresp.do_esi = true;
+		}
 	}
 } -start
 
diff --git a/bin/varnishtest/tests/e00005.vtc b/bin/varnishtest/tests/e00005.vtc
index 76a82ab..832a6ee 100644
--- a/bin/varnishtest/tests/e00005.vtc
+++ b/bin/varnishtest/tests/e00005.vtc
@@ -19,7 +19,9 @@ server s1 {
 
 varnish v1 -vcl+backend {
 	sub vcl_backend_response {
-		set beresp.do_esi = true;
+		if (bereq.url != "/foo/body") {
+			set beresp.do_esi = true;
+		}
 	}
 } -start
 
diff --git a/bin/varnishtest/tests/e00006.vtc b/bin/varnishtest/tests/e00006.vtc
index 95dd08d..e1b7319 100644
--- a/bin/varnishtest/tests/e00006.vtc
+++ b/bin/varnishtest/tests/e00006.vtc
@@ -17,7 +17,7 @@ server s2 {
 	rxreq
 	expect req.url == "/body"
 	txresp -body {
-		Included file
+		<pre>Included file</pre>
 	}
 } -start
 
@@ -38,7 +38,7 @@ client c1 {
 	txreq -url /foo/bar -hdr "Host: froboz"
 	rxresp
 	expect resp.status == 200
-	expect resp.bodylen == 67
+	expect resp.bodylen == 78
 }
 
 client c1 -run
@@ -71,8 +71,6 @@ logexpect l1 -v v1 -g raw {
 	expect * * ESI_xmlerror "ERR after 0 ESI 1.0 <esi:include> invalid src= URL"
 	expect * * ESI_xmlerror "WARN after 0 ESI 1.0 <esi:include> https:// treated as http://"
 	expect * * ESI_xmlerror "ERR after 0 ESI 1.0 <esi:include> invalid src= URL"
-
-
 } -start
 
 client c1 {
diff --git a/bin/varnishtest/tests/e00008.vtc b/bin/varnishtest/tests/e00008.vtc
index 8767b73..1477341 100644
--- a/bin/varnishtest/tests/e00008.vtc
+++ b/bin/varnishtest/tests/e00008.vtc
@@ -45,14 +45,14 @@ server s1 {
 	rxreq
 	expect req.url == "/body"
 	txresp -body {
-		Included file
+		<pre>Included file</pre>
 		<esi:remove>
 		<Aaa
 	}
 	rxreq
 	expect req.url == "/body2"
 	txresp -body {
-		Included file 2
+		<pre>Included file 2</pre>
 		<!--esi
 		<![CDATA[fooo
 	}
@@ -81,7 +81,20 @@ logexpect l1 -v v1 -g vxid {
 	expect 0 = ESI_xmlerror {^ERR after 636 XML 1.0 Illegal attribute delimiter$}
 	expect 0 = ESI_xmlerror {^ERR after 665 ESI 1.0 </esi:include> illegal end-tag$}
 	expect 0 = ESI_xmlerror {^ERR after 767 XML 1.0 Missing end attribute delimiter$}
-}
+	expect 0 = BackendReuse
+
+## XXX something is fishy about any of: logexpect, vsl, slink's brain:
+## despite syncvsl and the fact that the loggin is output by
+## varnishtest, these fail (time out) - feedback appreciated
+#
+#	expect * * BereqURL	{^/body$}
+#	expect * = ESI_xmlerror {^ERR after 39 VEP ended inside a tag$}
+#	expect 0 = BackendReuse
+#
+#	expect * * BereqURL	{^/body2$}
+#	expect * = ESI_xmlerror {^ERR after 39 VEP ended inside a tag$}
+#	expect 0 = BackendReuse
+} -start
 
 varnish v1 -cliok "param.set debug +esi_chop"
 
@@ -91,10 +104,9 @@ client c1 {
 	txreq
 	rxresp
 	expect resp.status == 200
-	expect resp.bodylen == 464
+	expect resp.bodylen == 465
 }
 
-logexpect l1 -start
 client c1 -run
 logexpect l1 -wait
-varnish v1 -expect esi_errors == 15
+varnish v1 -expect esi_errors == 17
diff --git a/bin/varnishtest/tests/e00009.vtc b/bin/varnishtest/tests/e00009.vtc
index 03bc28c..70a8206 100644
--- a/bin/varnishtest/tests/e00009.vtc
+++ b/bin/varnishtest/tests/e00009.vtc
@@ -23,6 +23,10 @@ varnish v1 -vcl+backend {
 	}
 } -start
 
+logexpect l1 -v v1 -g raw {
+	expect * 1002 ESI_xmlerror esi_disable_xml_check
+} -start
+
 client c1 {
 	txreq
 	rxresp
@@ -30,6 +34,8 @@ client c1 {
 	expect resp.bodylen == 57
 } -run
 
+logexpect l1 -wait
+
 varnish v1  -cli "param.set feature +esi_disable_xml_check"
 
 client c1 {
diff --git a/bin/varnishtest/tests/e00012.vtc b/bin/varnishtest/tests/e00012.vtc
index 8ee2eca..0786c21 100644
--- a/bin/varnishtest/tests/e00012.vtc
+++ b/bin/varnishtest/tests/e00012.vtc
@@ -18,7 +18,9 @@ server s1 {
 
 varnish v1 -vcl+backend {
 	sub vcl_backend_response {
-		set beresp.do_esi = true;
+		if (bereq.url != "/foo/body") {
+			set beresp.do_esi = true;
+		}
 	}
 } -start
 
@@ -27,6 +29,7 @@ client c1 {
 	rxresp
 	expect resp.status == 200
 	expect resp.bodylen == 67
+	expect resp.http.Transfer-Encoding == "chunked"
 } -run
 
 client c1 {
@@ -34,6 +37,9 @@ client c1 {
 	rxresp
 	expect resp.status == 200
 	expect resp.bodylen == 67
+	expect resp.http.Transfer-Encoding == <undef>
+	expect resp.http.Content-Length == <undef>
+	expect resp.http.Connection == "close"
 } -run
 
 varnish v1 -expect esi_errors == 0
diff --git a/bin/varnishtest/tests/e00015.vtc b/bin/varnishtest/tests/e00015.vtc
index 7d09441..daaea75 100644
--- a/bin/varnishtest/tests/e00015.vtc
+++ b/bin/varnishtest/tests/e00015.vtc
@@ -18,7 +18,7 @@ server s1 {
 	rxreq
 	expect req.url == "/body"
 	txresp -body {
-		Included file
+		<pre>Included file</pre>
 	}
 } -start
 
@@ -40,7 +40,7 @@ client c1 {
 	expect resp.status == 200
 	txreq -url "/esi"
 	rxresp
-	expect resp.bodylen == 65
+	expect resp.bodylen == 76
 	expect resp.status == 200
 }
 
diff --git a/bin/varnishtest/tests/e00016.vtc b/bin/varnishtest/tests/e00016.vtc
index d256c28..7cf78cc 100644
--- a/bin/varnishtest/tests/e00016.vtc
+++ b/bin/varnishtest/tests/e00016.vtc
@@ -26,7 +26,7 @@ server s1 {
 	}
 } -start
 
-varnish v1 -vcl+backend {
+varnish v1 -arg "-p feature=+esi_disable_xml_check" -vcl+backend {
 	sub vcl_backend_response {
 		set beresp.do_esi = true;
 	}
diff --git a/bin/varnishtest/tests/e00017.vtc b/bin/varnishtest/tests/e00017.vtc
index 1ced505..dd50ced 100644
--- a/bin/varnishtest/tests/e00017.vtc
+++ b/bin/varnishtest/tests/e00017.vtc
@@ -29,45 +29,45 @@ server s1 {
 		After include
 	}
 	rxreq
-	txresp -body { Included file 00 }
+	txresp -body { <pre>Included file 00</pre> }
 	rxreq
-	txresp -body { Included file 01 }
+	txresp -body { <pre>Included file 01</pre> }
 	rxreq
-	txresp -body { Included file 02 }
+	txresp -body { <pre>Included file 02</pre> }
 	rxreq
-	txresp -body { Included file 03 }
+	txresp -body { <pre>Included file 03</pre> }
 	rxreq
-	txresp -body { Included file 04 }
+	txresp -body { <pre>Included file 04</pre> }
 	rxreq
-	txresp -body { Included file 05 }
+	txresp -body { <pre>Included file 05</pre> }
 	rxreq
-	txresp -body { Included file 06 }
+	txresp -body { <pre>Included file 06</pre> }
 	rxreq
-	txresp -body { Included file 07 }
+	txresp -body { <pre>Included file 07</pre> }
 	rxreq
-	txresp -body { Included file 08 }
+	txresp -body { <pre>Included file 08</pre> }
 	rxreq
-	txresp -body { Included file 09 }
+	txresp -body { <pre>Included file 09</pre> }
 	rxreq
-	txresp -body { Included file 10 }
+	txresp -body { <pre>Included file 10</pre> }
 	rxreq
-	txresp -body { Included file 11 }
+	txresp -body { <pre>Included file 11</pre> }
 	rxreq
-	txresp -body { Included file 12 }
+	txresp -body { <pre>Included file 12</pre> }
 	rxreq
-	txresp -body { Included file 13 }
+	txresp -body { <pre>Included file 13</pre> }
 	rxreq
-	txresp -body { Included file 14 }
+	txresp -body { <pre>Included file 14</pre> }
 	rxreq
-	txresp -body { Included file 15 }
+	txresp -body { <pre>Included file 15</pre> }
 	rxreq
-	txresp -body { Included file 16 }
+	txresp -body { <pre>Included file 16</pre> }
 	rxreq
-	txresp -body { Included file 17 }
+	txresp -body { <pre>Included file 17</pre> }
 	rxreq
-	txresp -body { Included file 18 }
+	txresp -body { <pre>Included file 18</pre> }
 	rxreq
-	txresp -body { Included file 19 }
+	txresp -body { <pre>Included file 19</pre> }
 } -start
 
 varnish v1 -vcl+backend {
@@ -80,6 +80,8 @@ client c1 {
 	txreq
 	rxresp
 	expect resp.status == 200
+	# before 29, includes 20*(29+3), after 15
+	expect resp.bodylen == 684
 }
 
 client c1 -run
diff --git a/bin/varnishtest/tests/e00018.vtc b/bin/varnishtest/tests/e00018.vtc
index 4a410cd..bf827b5 100644
--- a/bin/varnishtest/tests/e00018.vtc
+++ b/bin/varnishtest/tests/e00018.vtc
@@ -37,7 +37,9 @@ varnish v1 -vcl+backend {
 		return (pass);
 	}
 	sub vcl_backend_response {
-		set beresp.do_esi = true;
+		if (bereq.url == "/") {
+			set beresp.do_esi = true;
+		}
 	}
 } -start
 
diff --git a/bin/varnishtest/tests/e00019.vtc b/bin/varnishtest/tests/e00019.vtc
index 88aa405..0bf98e0 100644
--- a/bin/varnishtest/tests/e00019.vtc
+++ b/bin/varnishtest/tests/e00019.vtc
@@ -55,6 +55,17 @@ varnish v1 -vcl+backend {
 varnish v1 -cliok "param.set debug +esi_chop"
 varnish v1 -cliok "param.set debug +syncvsl"
 
+logexpect l1 -v v1 -g raw {
+	expect * * Fetch_Body   {^2 chunked -$}
+	expect 0 = ESI_xmlerror {^ERR after 3 ESI 1.0 </esi:comment> illegal end-tag$}
+	expect 0 = ESI_xmlerror {^ERR after 27 XML 1.0 '>' does not follow '/' in tag$}
+	expect 0 = ESI_xmlerror {^ERR after 43 ESI 1.0 <esi:comment> needs final '/'$}
+	expect 0 = ESI_xmlerror {^WARN after 107 ESI 1.0 <esi:include> lacks final '/'$}
+	expect 0 = ESI_xmlerror {^ERR after 130 ESI 1.0 <esi:bogus> element$}
+	expect 0 = ESI_xmlerror {^ERR after 131837 VEP ended inside a tag$}
+	expect 0 = BackendReuse {^25 vcl1.s1$}
+} -start
+
 client c1 {
 	txreq  -url bar
 	rxresp
@@ -62,5 +73,7 @@ client c1 {
 	expect resp.bodylen == 65856
 } -run
 
+logexpect l1 -wait
+
 varnish v1 -expect esi_errors == 5
 varnish v1 -expect esi_warnings == 1
diff --git a/bin/varnishtest/tests/e00020.vtc b/bin/varnishtest/tests/e00020.vtc
index 9913e33..7c27efa 100644
--- a/bin/varnishtest/tests/e00020.vtc
+++ b/bin/varnishtest/tests/e00020.vtc
@@ -22,6 +22,14 @@ varnish v1 -vcl+backend {
 
 varnish v1 -cliok "param.set http_gzip_support true"
 
+logexpect l1 -v v1 -g vxid {
+	expect * * Fetch_Body
+	expect 0 = ESI_xmlerror {^ERR after 3 ESI 1.0 <esi:include> element nested in <esi:remove>$}
+	expect 0 = ESI_xmlerror {^ERR after 3 ESI 1.0 Nested <!--esi element in <esi:remove>$}
+	expect 0 = Gzip         {^U}
+	expect 0 = BackendReuse
+} -start
+
 client c1 {
 	txreq
 	rxresp
@@ -31,3 +39,4 @@ client c1 {
 
 client c1 -run
 varnish v1 -expect esi_errors == 2
+logexpect l1 -wait
diff --git a/bin/varnishtest/tests/e00022.vtc b/bin/varnishtest/tests/e00022.vtc
index ecc606b..65e14d1 100644
--- a/bin/varnishtest/tests/e00022.vtc
+++ b/bin/varnishtest/tests/e00022.vtc
@@ -27,6 +27,15 @@ varnish v1 -cliok "param.set debug +esi_chop"
 varnish v1 -cliok "param.set http_gzip_support true"
 varnish v1 -cliok "param.set gzip_memlevel 1"
 
+logexpect l1 -v v1 -g vxid {
+	expect * * Fetch_Body
+	expect 0 = ESI_xmlerror {^ERR after 24 ESI 1.0 <esi:include> element nested in <esi:remove>$}
+	expect 0 = ESI_xmlerror {^ERR after 24 ESI 1.0 Nested <!--esi element in <esi:remove>$}
+	expect 0 = Gzip         {^G}
+	expect 0 = Gzip         {^U}
+	expect 0 = BackendReuse
+} -start
+
 client c1 {
 	txreq  -hdr "Accept-Encoding: gzip"
 	rxresp
@@ -38,3 +47,4 @@ client c1 {
 
 client c1 -run
 varnish v1 -expect esi_errors == 2
+logexpect l1 -wait
diff --git a/bin/varnishtest/tests/e00028.vtc b/bin/varnishtest/tests/e00028.vtc
index a32814c..9a5fe16 100644
--- a/bin/varnishtest/tests/e00028.vtc
+++ b/bin/varnishtest/tests/e00028.vtc
@@ -34,7 +34,7 @@ server s1 {
 	txresp -hdr "Vary: fooqux, Accept-Encoding" -gzipbody "fooqux"
 } -start
 
-varnish v1 -vcl+backend {
+varnish v1 -arg "-p feature=+esi_disable_xml_check" -vcl+backend {
 	sub vcl_backend_response {
 		set beresp.do_esi = true;
 		if (bereq.url ~ "/baz") {
diff --git a/bin/varnishtest/tests/e00030.vtc b/bin/varnishtest/tests/e00030.vtc
index 7779f98..eaa998a 100644
--- a/bin/varnishtest/tests/e00030.vtc
+++ b/bin/varnishtest/tests/e00030.vtc
@@ -1,6 +1,7 @@
 varnishtest "Test req_top.* in an ESI context"
 
-varnish v1 -errvcl {Variable 'req_top.url' is read only.} {
+varnish v1 -arg "-p feature=+esi_disable_xml_check" \
+	   -errvcl {Variable 'req_top.url' is read only.} {
 	sub vcl_recv {
 		set req_top.url = "/foo";
 	}
@@ -37,7 +38,7 @@ server s1 {
 	expect req.http.top-method == "GET"
 	expect req.http.top-proto == "HTTP/1.1"
 	expect req.http.top-foo == "bar"
-	expect req.url == "/b1"
+	expect req.url == "/c2"
 	txresp
 
 	rxreq
@@ -45,7 +46,7 @@ server s1 {
 	expect req.http.top-method == "GET"
 	expect req.http.top-proto == "HTTP/1.1"
 	expect req.http.top-foo == "bar"
-	expect req.url == "/c2"
+	expect req.url == "/b1"
 	txresp
 } -start
 
@@ -71,6 +72,7 @@ client c1 {
 	txreq
 	rxresp
 	expect resp.status == 200
+	expect resp.bodylen == 81
 } -run
 
 varnish v1 -expect esi_errors == 0
diff --git a/bin/varnishtest/tests/g00002.vtc b/bin/varnishtest/tests/g00002.vtc
index 30b05ad..6afddd8 100644
--- a/bin/varnishtest/tests/g00002.vtc
+++ b/bin/varnishtest/tests/g00002.vtc
@@ -13,6 +13,7 @@ server s1 {
 
 varnish v1 \
 	-arg "-sdefault,2m" \
+	-arg "-p feature=+esi_disable_xml_check" \
 	-cliok "param.set http_gzip_support true" \
 	-cliok "param.set gzip_memlevel 1" \
 	-vcl+backend {
diff --git a/bin/varnishtest/tests/l00003.vtc b/bin/varnishtest/tests/l00003.vtc
index 4bbb04e..af3675e 100644
--- a/bin/varnishtest/tests/l00003.vtc
+++ b/bin/varnishtest/tests/l00003.vtc
@@ -16,7 +16,9 @@ server s1 {
 
 varnish v1 -vcl+backend {
 	sub vcl_backend_response {
-		set beresp.do_esi = true;
+		if (bereq.url != "/2") {
+			set beresp.do_esi = true;
+		}
 	}
 	sub vcl_deliver {
 		unset resp.http.date;
diff --git a/bin/varnishtest/tests/r00326.vtc b/bin/varnishtest/tests/r00326.vtc
index 00ac603..3a9d389 100644
--- a/bin/varnishtest/tests/r00326.vtc
+++ b/bin/varnishtest/tests/r00326.vtc
@@ -4,7 +4,7 @@ server s1 {
 	rxreq
 	txresp -body {<esi:include src="/foo"/><esi:include src="/foo"/>}
 	rxreq
-	txresp -body "FOO\n"
+	txresp -body "<pre>FOO</pre>\n"
 } -start
 
 varnish v1 -vcl+backend {
@@ -17,5 +17,5 @@ client c1 {
 	txreq
 	rxresp
 	expect resp.status == 200
-	expect resp.bodylen == 8
+	expect resp.bodylen == 30
 } -run
diff --git a/bin/varnishtest/tests/r00345.vtc b/bin/varnishtest/tests/r00345.vtc
index 9041acd..f87f655 100644
--- a/bin/varnishtest/tests/r00345.vtc
+++ b/bin/varnishtest/tests/r00345.vtc
@@ -4,7 +4,7 @@ barrier b1 cond 2
 
 server s1 {
 	rxreq
-	txresp -body {<esi:include src="someurl">}
+	txresp -body {<esi:include src="someurl"/>}
 	rxreq
 	barrier b1 sync
 	delay 1
diff --git a/bin/varnishtest/tests/r00427.vtc b/bin/varnishtest/tests/r00427.vtc
index c097494..f116c60 100644
--- a/bin/varnishtest/tests/r00427.vtc
+++ b/bin/varnishtest/tests/r00427.vtc
@@ -28,7 +28,9 @@ server s1 {
 
 varnish v1 -vcl+backend {
 	sub vcl_backend_response {
-		set beresp.do_esi = true;
+		if (bereq.url == "/") {
+			set beresp.do_esi = true;
+		}
 	}
 } -start
 
diff --git a/bin/varnishtest/tests/r00445.vtc b/bin/varnishtest/tests/r00445.vtc
index 1d6be3b..3334415 100644
--- a/bin/varnishtest/tests/r00445.vtc
+++ b/bin/varnishtest/tests/r00445.vtc
@@ -3,13 +3,13 @@ varnishtest "zero length ESI include segmens with chunked encoding"
 server s1 {
 	rxreq
 	expect req.url == "/"
-	txresp -body {<foo><esi:include src="/bar"><bar>}
+	txresp -body {<foo><esi:include src="/bar"/><bar>}
 	rxreq
 	expect req.url == "/bar"
 	txresp
 } -start
 
-varnish v1 -vcl+backend {
+varnish v1 -arg "-p feature=+esi_disable_xml_check" -vcl+backend {
 	sub vcl_backend_response {
 		set beresp.do_esi = true;
 	}
diff --git a/bin/varnishtest/tests/r00476.vtc b/bin/varnishtest/tests/r00476.vtc
index 9804d2f..41436f8 100644
--- a/bin/varnishtest/tests/r00476.vtc
+++ b/bin/varnishtest/tests/r00476.vtc
@@ -3,7 +3,7 @@ varnishtest "zero length ESI include segments with chunked encoding"
 server s1 {
 	rxreq
 	expect req.url == "/"
-	txresp -body {<a><esi:include src="/bar"><b>\0c}
+	txresp -body {<a><esi:include src="/bar"/><b>\0c}
 	rxreq
 	expect req.url == "/bar"
 	txresp
@@ -12,7 +12,7 @@ server s1 {
 	txresp -body {<a><!--esi foo --><b>\0c}
 	rxreq
 	expect req.url == "/nullbefore"
-	txresp -body {<a>\0<esi:include src="/bar"><b>c}
+	txresp -body {<a>\0<esi:include src="/bar"/><b>c}
 } -start
 
 varnish v1 -vcl+backend {
diff --git a/bin/varnishtest/tests/r00590.vtc b/bin/varnishtest/tests/r00590.vtc
index ce16ba5..ab0bba4 100644
--- a/bin/varnishtest/tests/r00590.vtc
+++ b/bin/varnishtest/tests/r00590.vtc
@@ -61,7 +61,9 @@ varnish v1 -vcl+backend {
 		return (pass);
 	}
 	sub vcl_backend_response {
-		set beresp.do_esi = true;
+		if (bereq.url == "/") {
+			set beresp.do_esi = true;
+		}
 	}
 } -start
 
diff --git a/bin/varnishtest/tests/r00612.vtc b/bin/varnishtest/tests/r00612.vtc
index d36e5a0..46ec702 100644
--- a/bin/varnishtest/tests/r00612.vtc
+++ b/bin/varnishtest/tests/r00612.vtc
@@ -32,7 +32,7 @@ server s1 {
 	txresp -body "55555"
 } -start
 
-varnish v1 -vcl+backend {
+varnish v1 -arg "-p feature=+esi_disable_xml_check" -vcl+backend {
 	sub vcl_recv {
 		return (pass);
 	}
diff --git a/bin/varnishtest/tests/r00894.vtc b/bin/varnishtest/tests/r00894.vtc
index 04a793d..4a81523 100644
--- a/bin/varnishtest/tests/r00894.vtc
+++ b/bin/varnishtest/tests/r00894.vtc
@@ -11,8 +11,16 @@ varnish v1 -vcl+backend {
 	}
 } -start
 
+logexpect l1 -v v1 -g raw {
+	expect * * Fetch_Body
+	expect 0 = ESI_xmlerror {^ERR after 5 ESI 1.0 <esi:include> has multiple src= attributes$}
+	expect 0 = BackendReuse
+} -start
+
 client c1 {
 	txreq
 	rxresp
 	expect resp.bodylen == 10
 } -run
+
+logexpect l1 -wait
diff --git a/bin/varnishtest/tests/r00961.vtc b/bin/varnishtest/tests/r00961.vtc
index c6e9209..320dc4f 100644
--- a/bin/varnishtest/tests/r00961.vtc
+++ b/bin/varnishtest/tests/r00961.vtc
@@ -37,7 +37,9 @@ varnish v1 -vcl+backend {
 		return (pass);
 	}
 	sub vcl_backend_response {
-		set beresp.do_esi = true;
+		if (bereq.url == "/") {
+			set beresp.do_esi = true;
+		}
 	}
 } -start
 
diff --git a/bin/varnishtest/tests/r01029.vtc b/bin/varnishtest/tests/r01029.vtc
index 7058ef4..23d25a6 100644
--- a/bin/varnishtest/tests/r01029.vtc
+++ b/bin/varnishtest/tests/r01029.vtc
@@ -13,8 +13,8 @@ server s1 {
 
 varnish v1 -vcl+backend {
 	sub vcl_backend_response {
-		set beresp.do_esi = true;
 		if (bereq.url == "/foo") {
+			set beresp.do_esi = true;
 			set beresp.ttl = 0s;
 		} else {
 			set beresp.ttl = 10m;
diff --git a/bin/varnishtest/tests/r01038.vtc b/bin/varnishtest/tests/r01038.vtc
index 705e11c..540deb8 100644
--- a/bin/varnishtest/tests/r01038.vtc
+++ b/bin/varnishtest/tests/r01038.vtc
@@ -47,7 +47,9 @@ server s1 {
 
 varnish v1 -arg "-p workspace_backend=10k" -vcl+backend {
 	sub vcl_backend_response {
-		set beresp.do_esi = true;
+		if (bereq.url == "/") {
+			set beresp.do_esi = true;
+		}
 	}
 } -start
 
@@ -62,4 +64,3 @@ client c1 {
 } -run
 
 varnish v1 -expect losthdr == 0
-
diff --git a/bin/varnishtest/tests/r01092.vtc b/bin/varnishtest/tests/r01092.vtc
index 7512ea4..a53b7ba 100644
--- a/bin/varnishtest/tests/r01092.vtc
+++ b/bin/varnishtest/tests/r01092.vtc
@@ -24,6 +24,12 @@ varnish v1 -vcl+backend {
 	}
 } -start
 
+logexpect l1 -v v1 -g raw {
+	expect * * Fetch_Body
+	expect 0 * ESI_xmlerror {^ERR after 66 ESI 1.0 Nested <!--esi element in <esi:remove>$}
+	expect 0 = BackendReuse
+} -start
+
 client c1 {
 	txreq
 	rxresp
@@ -32,3 +38,4 @@ client c1 {
 
 client c1 -run
 varnish v1 -expect esi_errors == 1
+logexpect l1 -wait
diff --git a/bin/varnishtest/tests/r01184.vtc b/bin/varnishtest/tests/r01184.vtc
index 8cfb741..d5aba32 100644
--- a/bin/varnishtest/tests/r01184.vtc
+++ b/bin/varnishtest/tests/r01184.vtc
@@ -33,7 +33,9 @@ server s1 {
 
 varnish v1 -vcl+backend {
 	sub vcl_backend_response {
-		set beresp.do_esi = true;
+		if (bereq.url != "/incl") {
+			set beresp.do_esi = true;
+		}
 	}
 } -start
 
diff --git a/bin/varnishtest/tests/r01355.vtc b/bin/varnishtest/tests/r01355.vtc
index 0aa132b..44b1b39 100644
--- a/bin/varnishtest/tests/r01355.vtc
+++ b/bin/varnishtest/tests/r01355.vtc
@@ -21,6 +21,16 @@ varnish v1 -vcl+backend {
 	}
 } -start
 
+logexpect l1 -v v1 -g raw {
+	expect * * Fetch_Body
+	expect 0 = ESI_xmlerror {^No ESI processing, first char not '<' but BOM. .See feature esi_remove_bom.$}
+	expect 0 = BackendReuse
+# XXX another logexpect weirdness - why can't we catch the second occurrence?
+#	expect * * Fetch_Body
+#	expect 0 = ESI_xmlerror {^No ESI processing, first char not '<' but BOM. .See feature esi_remove_bom.$}
+#	expect 0 = BackendReuse
+} -start
+
 client c1 {
 	# No ESI processing
 	txreq -url /1
@@ -28,6 +38,8 @@ client c1 {
 	expect resp.bodylen == 47
 } -run
 
+logexpect l1 -wait
+
 varnish v1 -cliok "param.set feature +esi_remove_bom"
 
 client c1 {
diff --git a/bin/varnishtest/tests/r01641.vtc b/bin/varnishtest/tests/r01641.vtc
index 1dddc85..0fb5f7b 100644
--- a/bin/varnishtest/tests/r01641.vtc
+++ b/bin/varnishtest/tests/r01641.vtc
@@ -13,7 +13,7 @@ server s2 {
 server s1 -start
 server s2 -start
 
-varnish v1 -vcl+backend {
+varnish v1 -arg "-p feature=+esi_disable_xml_check" -vcl+backend {
 	sub vcl_recv {
 		return (pass);
 	}
diff --git a/bin/varnishtest/tests/r01737.vtc b/bin/varnishtest/tests/r01737.vtc
index 182d1f0..845b1de 100644
--- a/bin/varnishtest/tests/r01737.vtc
+++ b/bin/varnishtest/tests/r01737.vtc
@@ -23,7 +23,7 @@ server s1 {
 	rxresp
 } -start
 
-varnish v1 -vcl+backend {
+varnish v1 -arg "-p feature=+esi_disable_xml_check" -vcl+backend {
 	sub vcl_backend_response {
 		set beresp.do_esi = true;
 	}
diff --git a/bin/varnishtest/tests/r01781.vtc b/bin/varnishtest/tests/r01781.vtc
index 174f82f..4801d06 100644
--- a/bin/varnishtest/tests/r01781.vtc
+++ b/bin/varnishtest/tests/r01781.vtc
@@ -13,7 +13,7 @@ server s1 {
 	txresp -body {Foo}
 } -start
 
-varnish v1 -vcl+backend {
+varnish v1 -arg "-p feature=+esi_disable_xml_check" -vcl+backend {
 	sub vcl_backend_response {
 		set beresp.do_gzip = true;
 		set beresp.do_esi = true;
diff --git a/bin/varnishtest/tests/r01941.vtc b/bin/varnishtest/tests/r01941.vtc
index 79f21c9..2561bf1 100644
--- a/bin/varnishtest/tests/r01941.vtc
+++ b/bin/varnishtest/tests/r01941.vtc
@@ -1,4 +1,3 @@
-
 varnishtest "ESI memory should only be fully allocated"
 
 # In this test case, the cache is almost filled. Then we force the
@@ -24,6 +23,7 @@ server s1 {
 } -start
 
 varnish v1 -arg "-pfetch_chunksize=4k" \
+	-arg "-p feature=+esi_disable_xml_check" \
 	-arg "-sdefault,1m" -vcl+backend {
 	sub vcl_backend_response {
 		set beresp.do_esi = true;

From nils.goroll at uplex.de  Sat Nov  4 18:53:05 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Sat,  4 Nov 2017 18:53:05 +0000 (UTC)
Subject: [master] 9d0899e thank you, vtest
Message-ID: <20171104185305.8267D6151D@lists.varnish-cache.org>


commit 9d0899e5b64c4c076501819817198bd6bdba292a
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Sat Nov 4 19:52:18 2017 +0100

    thank you, vtest

diff --git a/bin/varnishtest/tests/e00019.vtc b/bin/varnishtest/tests/e00019.vtc
index 0bf98e0..c29ef78 100644
--- a/bin/varnishtest/tests/e00019.vtc
+++ b/bin/varnishtest/tests/e00019.vtc
@@ -56,14 +56,14 @@ varnish v1 -cliok "param.set debug +esi_chop"
 varnish v1 -cliok "param.set debug +syncvsl"
 
 logexpect l1 -v v1 -g raw {
-	expect * * Fetch_Body   {^2 chunked -$}
+	expect * * Fetch_Body
 	expect 0 = ESI_xmlerror {^ERR after 3 ESI 1.0 </esi:comment> illegal end-tag$}
 	expect 0 = ESI_xmlerror {^ERR after 27 XML 1.0 '>' does not follow '/' in tag$}
 	expect 0 = ESI_xmlerror {^ERR after 43 ESI 1.0 <esi:comment> needs final '/'$}
 	expect 0 = ESI_xmlerror {^WARN after 107 ESI 1.0 <esi:include> lacks final '/'$}
 	expect 0 = ESI_xmlerror {^ERR after 130 ESI 1.0 <esi:bogus> element$}
 	expect 0 = ESI_xmlerror {^ERR after 131837 VEP ended inside a tag$}
-	expect 0 = BackendReuse {^25 vcl1.s1$}
+	expect 0 = BackendReuse
 } -start
 
 client c1 {

From nils.goroll at uplex.de  Sat Nov  4 20:17:04 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Sat,  4 Nov 2017 20:17:04 +0000 (UTC)
Subject: [master] 14bbe4b thank you again, vtest
Message-ID: <20171104201704.C5F4461D9F@lists.varnish-cache.org>


commit 14bbe4b4f2d23704a3c95307c942d83f35160429
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Sat Nov 4 21:16:44 2017 +0100

    thank you again, vtest

diff --git a/bin/varnishtest/tests/e00019.vtc b/bin/varnishtest/tests/e00019.vtc
index c29ef78..1caf60a 100644
--- a/bin/varnishtest/tests/e00019.vtc
+++ b/bin/varnishtest/tests/e00019.vtc
@@ -55,7 +55,7 @@ varnish v1 -vcl+backend {
 varnish v1 -cliok "param.set debug +esi_chop"
 varnish v1 -cliok "param.set debug +syncvsl"
 
-logexpect l1 -v v1 -g raw {
+logexpect l1 -v v1 -g vxid {
 	expect * * Fetch_Body
 	expect 0 = ESI_xmlerror {^ERR after 3 ESI 1.0 </esi:comment> illegal end-tag$}
 	expect 0 = ESI_xmlerror {^ERR after 27 XML 1.0 '>' does not follow '/' in tag$}

From nils.goroll at uplex.de  Sun Nov  5 09:56:06 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Sun,  5 Nov 2017 09:56:06 +0000 (UTC)
Subject: [master] 145d6e5 Make the error message for nuke_limit reached more
 helpful
Message-ID: <20171105095606.77B5261A39@lists.varnish-cache.org>


commit 145d6e554e36fb794c3805712d6f753048d47a75
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Sun Nov 5 10:54:47 2017 +0100

    Make the error message for nuke_limit reached more helpful
    
    Relates to #2480

diff --git a/bin/varnishd/storage/storage_lru.c b/bin/varnishd/storage/storage_lru.c
index 32d142e..6ebff17 100644
--- a/bin/varnishd/storage/storage_lru.c
+++ b/bin/varnishd/storage/storage_lru.c
@@ -171,7 +171,7 @@ LRU_NukeOne(struct worker *wrk, struct lru *lru)
 	CHECK_OBJ_NOTNULL(lru, LRU_MAGIC);
 
 	if (wrk->strangelove-- <= 0) {
-		VSLb(wrk->vsl, SLT_ExpKill, "LRU_Exhausted");
+		VSLb(wrk->vsl, SLT_ExpKill, "LRU reached nuke_limit");
 		return (0);
 	}
 

From phk at FreeBSD.org  Mon Nov  6 07:41:08 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Mon,  6 Nov 2017 07:41:08 +0000 (UTC)
Subject: [master] 8d673ea Make error messages in vmod function arguments less
 confusing.
Message-ID: <20171106074108.8B451623EB@lists.varnish-cache.org>


commit 8d673ea9de68e769c95b6d084f8ecdfacb3265c4
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Nov 2 22:17:22 2017 +0000

    Make error messages in vmod function arguments less confusing.

diff --git a/lib/libvcc/vcc_expr.c b/lib/libvcc/vcc_expr.c
index 52159cb..17636da 100644
--- a/lib/libvcc/vcc_expr.c
+++ b/lib/libvcc/vcc_expr.c
@@ -716,12 +716,9 @@ vcc_Eval_Func(struct vcc *tl, const char *spec,
 
 	t1 = tl->t;
 	vcc_func(tl, &e, spec, extra, sym);
-	if (!tl->err) {
-		vcc_expr_fmt(tl->fb, tl->indent, e);
-		VSB_cat(tl->fb, ";\n");
-	} else if (t1 != tl->t) {
-		vcc_ErrWhere2(tl, t1, tl->t);
-	}
+	ERRCHK(tl);
+	vcc_expr_fmt(tl->fb, tl->indent, e);
+	VSB_cat(tl->fb, ";\n");
 	vcc_delete_expr(e);
 }
 
diff --git a/lib/libvcc/vcc_vmod.c b/lib/libvcc/vcc_vmod.c
index 30a4ae0..92d63fd 100644
--- a/lib/libvcc/vcc_vmod.c
+++ b/lib/libvcc/vcc_vmod.c
@@ -310,6 +310,7 @@ vcc_ParseNew(struct vcc *tl)
 
 	bprintf(buf1, ", &%s, \"%s\"", sy1->rname, sy1->name);
 	vcc_Eval_Func(tl, p, buf1, sy2);
+	ERRCHK(tl);
 	ExpectErr(tl, ';');
 
 	while (p[0] != '\0' || p[1] != '\0' || p[2] != '\0')

From phk at FreeBSD.org  Mon Nov  6 07:41:08 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Mon,  6 Nov 2017 07:41:08 +0000 (UTC)
Subject: [master] 91eed28 Change white-space to PEP8
Message-ID: <20171106074108.A6441623ED@lists.varnish-cache.org>


commit 91eed287642c14cc0f0bd8dffa83d4cd3d0db6e0
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Fri Nov 3 08:13:33 2017 +0000

    Change white-space to PEP8

diff --git a/lib/libvcc/vmodtool.py b/lib/libvcc/vmodtool.py
index 6698a9d..7d26668 100755
--- a/lib/libvcc/vmodtool.py
+++ b/lib/libvcc/vmodtool.py
@@ -28,9 +28,9 @@
 
 """
 Read the vmod.vcc file (inputvcc) and produce:
-	vmod_if.h -- Prototypes for the implementation
-	vmod_if.c -- Magic glue & datastructures to make things a VMOD.
-	vmod_${name}.rst -- Extracted documentation
+    vmod_if.h -- Prototypes for the implementation
+    vmod_if.c -- Magic glue & datastructures to make things a VMOD.
+    vmod_${name}.rst -- Extracted documentation
 """
 
 # This script should work with both Python 2 and Python 3.
@@ -46,15 +46,15 @@ import random
 rstfmt = False
 strict_abi = True
 
-AMBOILERPLATE='''
+AMBOILERPLATE = '''
 # Boilerplate generated by vmodtool.py - changes will be overwritten
 
 AM_LDFLAGS  = $(AM_LT_LDFLAGS)
 
 AM_CPPFLAGS = \\
-	-I$(top_srcdir)/include \\
-	-I$(top_srcdir)/bin/varnishd \\
-	-I$(top_builddir)/include
+    -I$(top_srcdir)/include \\
+    -I$(top_srcdir)/bin/varnishd \\
+    -I$(top_builddir)/include
 
 vmoddir = $(pkglibdir)/vmods
 vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py
@@ -63,12 +63,12 @@ vmodtoolargs = --strict --boilerplate
 vmod_LTLIBRARIES = libvmod_XXX.la
 
 libvmod_XXX_la_CFLAGS = \\
-	@SAN_CFLAGS@
+    @SAN_CFLAGS@
 
 libvmod_XXX_la_LDFLAGS = \\
-	$(AM_LDFLAGS) \\
-	$(VMOD_LDFLAGS) \\
-	@SAN_LDFLAGS@
+    $(AM_LDFLAGS) \\
+    $(VMOD_LDFLAGS) \\
+    @SAN_LDFLAGS@
 
 nodist_libvmod_XXX_la_SOURCES = vcc_if.c vcc_if.h
 
@@ -79,854 +79,876 @@ $(libvmod_XXX_la_OBJECTS): vcc_if.h
 vcc_if.h vmod_XXX.rst vmod_XXX.man.rst: vcc_if.c
 
 vcc_if.c: $(vmodtool) $(srcdir)/vmod.vcc
-	@PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/vmod.vcc
+    @PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/vmod.vcc
 
 EXTRA_DIST = vmod.vcc automake_boilerplate.am
 
 CLEANFILES = $(builddir)/vcc_if.c $(builddir)/vcc_if.h \\
-	$(builddir)/vmod_XXX.rst \\
-	$(builddir)/vmod_XXX.man.rst
+    $(builddir)/vmod_XXX.rst \\
+    $(builddir)/vmod_XXX.man.rst
 
 '''
 
 ctypes = {
-	'ACL':		"VCL_ACL",
-	'BACKEND':	"VCL_BACKEND",
-	'BLOB':		"VCL_BLOB",
-	'BODY':		"VCL_BODY",
-	'BOOL':		"VCL_BOOL",
-	'BYTES':	"VCL_BYTES",
-	'DURATION':	"VCL_DURATION",
-	'ENUM':		"VCL_ENUM",
-	'HEADER':	"VCL_HEADER",
-	'HTTP':		"VCL_HTTP",
-	'INT':		"VCL_INT",
-	'IP':		"VCL_IP",
-	'PRIV_CALL':	"struct vmod_priv *",
-	'PRIV_VCL':	"struct vmod_priv *",
-	'PRIV_TASK':	"struct vmod_priv *",
-	'PRIV_TOP':	"struct vmod_priv *",
-	'PROBE':	"VCL_PROBE",
-	'REAL':		"VCL_REAL",
-	'STEVEDORE':	"VCL_STEVEDORE",
-	'STRING':	"VCL_STRING",
-	'STRING_LIST':	"const char *, ...",
-	'TIME':		"VCL_TIME",
-	'VOID':		"VCL_VOID",
+    'ACL':         "VCL_ACL",
+    'BACKEND':     "VCL_BACKEND",
+    'BLOB':        "VCL_BLOB",
+    'BODY':        "VCL_BODY",
+    'BOOL':        "VCL_BOOL",
+    'BYTES':       "VCL_BYTES",
+    'DURATION':    "VCL_DURATION",
+    'ENUM':        "VCL_ENUM",
+    'HEADER':      "VCL_HEADER",
+    'HTTP':        "VCL_HTTP",
+    'INT':         "VCL_INT",
+    'IP':          "VCL_IP",
+    'PRIV_CALL':   "struct vmod_priv *",
+    'PRIV_VCL':    "struct vmod_priv *",
+    'PRIV_TASK':   "struct vmod_priv *",
+    'PRIV_TOP':    "struct vmod_priv *",
+    'PROBE':       "VCL_PROBE",
+    'REAL':        "VCL_REAL",
+    'STEVEDORE':   "VCL_STEVEDORE",
+    'STRING':      "VCL_STRING",
+    'STRING_LIST': "const char *, ...",
+    'TIME':        "VCL_TIME",
+    'VOID':        "VCL_VOID",
 }
 
 #######################################################################
 
+
 def write_file_warning(fo, a, b, c):
-	fo.write(a + "\n")
-	fo.write(b + " NB:  This file is machine generated, DO NOT EDIT!\n")
-	fo.write(b + "\n")
-	fo.write(b + " Edit vmod.vcc and run make instead\n")
-	fo.write(c + "\n\n")
+    fo.write(a + "\n")
+    fo.write(b + " NB:  This file is machine generated, DO NOT EDIT!\n")
+    fo.write(b + "\n")
+    fo.write(b + " Edit vmod.vcc and run make instead\n")
+    fo.write(c + "\n\n")
+
 
 def write_c_file_warning(fo):
-	write_file_warning(fo, "/*", " *", " */")
+    write_file_warning(fo, "/*", " *", " */")
+
 
 def write_rst_file_warning(fo):
-	write_file_warning(fo, "..", "..", "..")
+    write_file_warning(fo, "..", "..", "..")
+
 
 def write_rst_hdr(fo, s, below="-", above=None):
-	if above is not None:
-		fo.write(above * len(s) + "\n")
-	fo.write(s + "\n")
-	if below is not None:
-		fo.write(below * len(s) + "\n")
+    if above is not None:
+        fo.write(above * len(s) + "\n")
+    fo.write(s + "\n")
+    if below is not None:
+        fo.write(below * len(s) + "\n")
 
 #######################################################################
 
+
 def lwrap(s, width=64):
-	"""
-	Wrap a C-prototype like string into a number of lines.
-	"""
-	l = []
-	p = ""
-	while len(s) > width:
-		y = s[:width].rfind(',')
-		if y == -1:
-			y = s[:width].rfind('(')
-		if y == -1:
-			break
-		l.append(p + s[:y + 1])
-		s = s[y + 1:].lstrip()
-		p = "    "
-	if len(s) > 0:
-		l.append(p + s)
-	return l
+    """
+    Wrap a C-prototype like string into a number of lines.
+    """
+    l = []
+    p = ""
+    while len(s) > width:
+        y = s[:width].rfind(',')
+        if y == -1:
+            y = s[:width].rfind('(')
+        if y == -1:
+            break
+        l.append(p + s[:y + 1])
+        s = s[y + 1:].lstrip()
+        p = "    "
+    if len(s) > 0:
+        l.append(p + s)
+    return l
+
 
 def quote(s):
-	return s.replace("\"", "\\\"")
+    return s.replace("\"", "\\\"")
+
 
 def indent(p, n):
-	n = len(p.expandtabs()) + n
-	p = "\t" * int(n / 8)
-	p += " " * int(n % 8)
-	return p
+    n = len(p.expandtabs()) + n
+    p = "\t" * int(n / 8)
+    p += " " * int(n % 8)
+    return p
 
 #######################################################################
 
+
 def err(str, warn=True):
-	if opts.strict or not warn:
-		print("ERROR: " + str, file=sys.stderr)
-		exit(1)
-	else:
-		print("WARNING: " + str, file=sys.stderr)
+    if opts.strict or not warn:
+        print("ERROR: " + str, file=sys.stderr)
+        exit(1)
+    else:
+        print("WARNING: " + str, file=sys.stderr)
+
 
 def fmt_cstruct(fo, mn, x):
-	a = "\ttd_" + mn + "_" + x
-	while len(a.expandtabs()) < 40:
-		a += "\t"
-	fo.write("%s*%s;\n" % (a, x))
+    a = "\ttd_" + mn + "_" + x
+    while len(a.expandtabs()) < 40:
+        a += "\t"
+    fo.write("%s*%s;\n" % (a, x))
 
 #######################################################################
 
+
 class ctype(object):
-	def __init__(self, vt, ct):
-		self.vt = vt
-		self.ct = ct
-		self.nm = None
-		self.defval = None
-		self.spec = None
-
-	def __str__(self):
-		s = "<" + self.vt
-		if self.nm is not None:
-			s += " " + self.nm
-		if self.defval is not None:
-			s += " VAL=" + self.defval
-		if self.spec is not None:
-			s += " SPEC=" + str(self.spec)
-		return s + ">"
-
-	def vcl(self):
-		if self.vt == "STRING_LIST":
-			return "STRING"
-		if self.spec is None:
-			return self.vt
-		return self.vt + " {" + ",".join(self.spec) + "}"
-
-	def specstr(self, fo, p):
-		fo.write(p + '"' + self.vt)
-		fo.write('\\0"\n')
-		p = indent(p, 4)
-		if self.spec is not None:
-			fo.write(p + '"\\1"\n')
-			p = indent(p, 4)
-			for i in self.spec:
-				fo.write(p + '"' + i + '\\0"\n')
-			p = indent(p, -4)
-			# This terminating \1 is necessary to ensure that
-			# a prototype always ends with three \0's
-			fo.write(p + '"\\1\\0"\n')
-		if self.nm is not None:
-			fo.write(p + '"\\2" "' + self.nm + '\\0"\n')
-		if self.defval is not None:
-			fo.write(p + '"\\3" "' + quote(self.defval) + '\\0"\n')
+    def __init__(self, vt, ct):
+        self.vt = vt
+        self.ct = ct
+        self.nm = None
+        self.defval = None
+        self.spec = None
+
+    def __str__(self):
+        s = "<" + self.vt
+        if self.nm is not None:
+            s += " " + self.nm
+        if self.defval is not None:
+            s += " VAL=" + self.defval
+        if self.spec is not None:
+            s += " SPEC=" + str(self.spec)
+        return s + ">"
+
+    def vcl(self):
+        if self.vt == "STRING_LIST":
+            return "STRING"
+        if self.spec is None:
+            return self.vt
+        return self.vt + " {" + ",".join(self.spec) + "}"
+
+    def specstr(self, fo, p):
+        fo.write(p + '"' + self.vt)
+        fo.write('\\0"\n')
+        p = indent(p, 4)
+        if self.spec is not None:
+            fo.write(p + '"\\1"\n')
+            p = indent(p, 4)
+            for i in self.spec:
+                fo.write(p + '"' + i + '\\0"\n')
+            p = indent(p, -4)
+            # This terminating \1 is necessary to ensure that
+            # a prototype always ends with three \0's
+            fo.write(p + '"\\1\\0"\n')
+        if self.nm is not None:
+            fo.write(p + '"\\2" "' + self.nm + '\\0"\n')
+        if self.defval is not None:
+            fo.write(p + '"\\3" "' + quote(self.defval) + '\\0"\n')
+
 
 def vtype(txt):
-	j = len(txt)
-	for i in (',', ' ', '\n', '\t'):
-		x = txt.find(i)
-		if x > 0:
-			j = min(j, x)
-	t = txt[:j]
-	r = txt[j:].lstrip()
-	if t not in ctypes:
-		err("Did not recognize type <%s>" % txt)
-	ct = ctype(t, ctypes[t])
-	if t != "ENUM":
-		return ct, r
-	assert r[0] == '{'
-	e = r[1:].split('}', 1)
-	r = e[1].lstrip()
-	e = e[0].split(',')
-	ct.spec = []
-	for i in e:
-		ct.spec.append(i.strip())
-	return ct, r
+    j = len(txt)
+    for i in (',', ' ', '\n', '\t'):
+        x = txt.find(i)
+        if x > 0:
+            j = min(j, x)
+    t = txt[:j]
+    r = txt[j:].lstrip()
+    if t not in ctypes:
+        err("Did not recognize type <%s>" % txt)
+    ct = ctype(t, ctypes[t])
+    if t != "ENUM":
+        return ct, r
+    assert r[0] == '{'
+    e = r[1:].split('}', 1)
+    r = e[1].lstrip()
+    e = e[0].split(',')
+    ct.spec = []
+    for i in e:
+        ct.spec.append(i.strip())
+    return ct, r
+
 
 def arg(txt):
-	a, s = vtype(txt)
-	if len(s) == 0 or s[0] == ',':
-		return a, s
-
-	i = s.find('=')
-	j = s.find(',')
-	if j < 0:
-		j = len(s)
-	if j < i:
-		i = -1
-	if i < 0:
-		i = s.find(',')
-		if i < 0:
-			i = len(s)
-		a.nm = s[:i].rstrip()
-		s = s[i:]
-		return a, s
-
-	a.nm = s[:i].rstrip()
-	s = s[i + 1:].lstrip()
-	if s[0] == '"' or s[0] == "'":
-		m = re.match("(['\"]).*?(\\1)", s)
-		if not m:
-			err("Unbalanced quote")
-		a.defval = s[:m.end()]
-		s = s[m.end():]
-	else:
-		i = s.find(',')
-		if i < 0:
-			i = len(s)
-		a.defval = s[:i].rstrip()
-		s = s[i:]
-
-	return a, s
+    a, s = vtype(txt)
+    if len(s) == 0 or s[0] == ',':
+        return a, s
+
+    i = s.find('=')
+    j = s.find(',')
+    if j < 0:
+        j = len(s)
+    if j < i:
+        i = -1
+    if i < 0:
+        i = s.find(',')
+        if i < 0:
+            i = len(s)
+        a.nm = s[:i].rstrip()
+        s = s[i:]
+        return a, s
+
+    a.nm = s[:i].rstrip()
+    s = s[i + 1:].lstrip()
+    if s[0] == '"' or s[0] == "'":
+        m = re.match("(['\"]).*?(\\1)", s)
+        if not m:
+            err("Unbalanced quote")
+        a.defval = s[:m.end()]
+        s = s[m.end():]
+    else:
+        i = s.find(',')
+        if i < 0:
+            i = len(s)
+        a.defval = s[:i].rstrip()
+        s = s[i:]
+
+    return a, s
+
 
 # XXX cant have ( or ) in an argument default value
 class prototype(object):
-	def __init__(self, st, retval=True, prefix=""):
-		l = st.line[1]
-		while True:
-			a1 = l.count("(")
-			a2 = l.count(")")
-			if a1 > 0 and a1 == a2:
-				break
-			n = st.doc.split("\n", 1)
-			l += n[0]
-			st.doc = n[1]
-
-		if retval:
-			self.retval, s = vtype(l)
-		else:
-			self.retval = None
-			s = l
-		i = s.find("(")
-		assert i > 0
-		self.name = prefix + s[:i].strip()
-		s = s[i:].strip()
-		assert s[0] == "("
-		assert s[-1] == ")"
-		s = s[1:-1].lstrip()
-		self.args = []
-		while len(s) > 0:
-			a, s = arg(s)
-			self.args.append(a)
-			s = s.lstrip()
-			if len(s) == 0:
-				break
-			assert s[0] == ','
-			s = s[1:].lstrip()
-
-	def cname(self):
-		return self.name.replace(".", "_")
-
-	def vcl_proto(self, short):
-		s = ""
-		if self.retval is not None:
-			s += self.retval.vcl() + " "
-		s += self.name + "("
-		l = []
-		for i in self.args:
-			t = i.vcl()
-			if not short:
-				if i.nm is not None:
-					t += " " + i.nm
-				if i.defval is not None:
-					t += "=" + i.defval
-			l.append(t)
-		s += ", ".join(l) + ")"
-		return s
-
-	def c_ret(self):
-		return self.retval.ct
-
-	def c_args(self):
-		if len(self.args) == 0:
-			return ""
-		l = [""]
-		for i in self.args:
-			l.append(i.ct)
-		return ", ".join(l)
-
-	def specstr(self, fo, cfunc, p):
-		if self.retval is None:
-			fo.write(p + '"VOID\\0"\n')
-		else:
-			self.retval.specstr(fo, p)
-		fo.write(p + '"' + cfunc + '\\0"\n')
-		p = indent(p, 4)
-		if self.args is not None:
-			for i in self.args:
-				i.specstr(fo, p)
-		fo.write(p + '"\\0"\n')
+    def __init__(self, st, retval=True, prefix=""):
+        l = st.line[1]
+        while True:
+            a1 = l.count("(")
+            a2 = l.count(")")
+            if a1 > 0 and a1 == a2:
+                break
+            n = st.doc.split("\n", 1)
+            l += n[0]
+            st.doc = n[1]
+
+        if retval:
+            self.retval, s = vtype(l)
+        else:
+            self.retval = None
+            s = l
+        i = s.find("(")
+        assert i > 0
+        self.name = prefix + s[:i].strip()
+        s = s[i:].strip()
+        assert s[0] == "("
+        assert s[-1] == ")"
+        s = s[1:-1].lstrip()
+        self.args = []
+        while len(s) > 0:
+            a, s = arg(s)
+            self.args.append(a)
+            s = s.lstrip()
+            if len(s) == 0:
+                break
+            assert s[0] == ','
+            s = s[1:].lstrip()
+
+    def cname(self):
+        return self.name.replace(".", "_")
+
+    def vcl_proto(self, short):
+        s = ""
+        if self.retval is not None:
+            s += self.retval.vcl() + " "
+        s += self.name + "("
+        l = []
+        for i in self.args:
+            t = i.vcl()
+            if not short:
+                if i.nm is not None:
+                    t += " " + i.nm
+                if i.defval is not None:
+                    t += "=" + i.defval
+            l.append(t)
+        s += ", ".join(l) + ")"
+        return s
+
+    def c_ret(self):
+        return self.retval.ct
+
+    def c_args(self):
+        if len(self.args) == 0:
+            return ""
+        l = [""]
+        for i in self.args:
+            l.append(i.ct)
+        return ", ".join(l)
+
+    def specstr(self, fo, cfunc, p):
+        if self.retval is None:
+            fo.write(p + '"VOID\\0"\n')
+        else:
+            self.retval.specstr(fo, p)
+        fo.write(p + '"' + cfunc + '\\0"\n')
+        p = indent(p, 4)
+        if self.args is not None:
+            for i in self.args:
+                i.specstr(fo, p)
+        fo.write(p + '"\\0"\n')
 
 #######################################################################
 
+
 class stanza(object):
-	def __init__(self, l0, doc, vcc):
-		self.line = l0
-		if len(doc) == 1:
-			self.doc = doc[0]
-		else:
-			self.doc = ""
-		self.vcc = vcc
-		self.rstlbl = None
-		self.methods = None
-		self.proto = None
-		self.parse()
-
-	def dump(self):
-		print(type(self), self.line)
-
-	def rstfile(self, fo, man):
-		if self.rstlbl is not None:
-			fo.write(".. _" + self.rstlbl + ":\n\n")
-
-		self.rsthead(fo, man)
-		self.rstmid(fo, man)
-		self.rsttail(fo, man)
-
-	def rsthead(self, fo, man):
-		if self.proto is None:
-			return
-		if rstfmt:
-			s = self.proto.vcl_proto(short=False)
-			write_rst_hdr(fo, s, '-')
-		else:
-			write_rst_hdr(fo, self.proto.name, '-')
-			s = self.proto.vcl_proto(short=False)
-			fo.write("\n::\n\n\t%s\n" % s)
-
-	def rstmid(self, fo, man):
-		fo.write(self.doc + "\n")
-
-	def rsttail(self, fo, man):
-		return
-
-	def hfile(self, fo):
-		return
-
-	def cstruct(self, fo):
-		return
-
-	def cstruct_init(self, fo):
-		return
-
-	def specstr(self, fo):
-		return
+    def __init__(self, l0, doc, vcc):
+        self.line = l0
+        if len(doc) == 1:
+            self.doc = doc[0]
+        else:
+            self.doc = ""
+        self.vcc = vcc
+        self.rstlbl = None
+        self.methods = None
+        self.proto = None
+        self.parse()
+
+    def dump(self):
+        print(type(self), self.line)
+
+    def rstfile(self, fo, man):
+        if self.rstlbl is not None:
+            fo.write(".. _" + self.rstlbl + ":\n\n")
+
+        self.rsthead(fo, man)
+        self.rstmid(fo, man)
+        self.rsttail(fo, man)
+
+    def rsthead(self, fo, man):
+        if self.proto is None:
+            return
+        if rstfmt:
+            s = self.proto.vcl_proto(short=False)
+            write_rst_hdr(fo, s, '-')
+        else:
+            write_rst_hdr(fo, self.proto.name, '-')
+            s = self.proto.vcl_proto(short=False)
+            fo.write("\n::\n\n\t%s\n" % s)
+
+    def rstmid(self, fo, man):
+        fo.write(self.doc + "\n")
+
+    def rsttail(self, fo, man):
+        return
+
+    def hfile(self, fo):
+        return
+
+    def cstruct(self, fo):
+        return
+
+    def cstruct_init(self, fo):
+        return
+
+    def specstr(self, fo):
+        return
 
 #######################################################################
 
+
 class s_module(stanza):
-	def parse(self):
-		a = self.line[1].split(None, 2)
-		self.vcc.modname = a[0]
-		self.vcc.mansection = a[1]
-		self.vcc.moddesc = a[2]
-		self.rstlbl = "vmod_%s(%s)" % (
-		    self.vcc.modname,
-		    self.vcc.mansection
-		)
-		self.vcc.contents.append(self)
-
-	def rsthead(self, fo, man):
-
-		write_rst_hdr(fo, self.vcc.sympfx + self.vcc.modname, "=", "=")
-		fo.write("\n")
-
-		write_rst_hdr(fo, self.vcc.moddesc, "-", "-")
-
-		fo.write("\n")
-		fo.write(":Manual section: " + self.vcc.mansection + "\n")
-
-		fo.write("\n")
-		write_rst_hdr(fo, "SYNOPSIS", "=")
-		fo.write("\n")
-		fo.write('import %s [from "path"] ;\n' % self.vcc.modname)
-		fo.write("\n")
-
-	def rsttail(self, fo, man):
-
-		write_rst_hdr(fo, "CONTENTS", "=")
-		fo.write("\n")
-
-		if man:
-			for i in self.vcc.contents[1:]:
-				if i.rstlbl is None:
-					continue
-				fo.write("* %s\n" %
-				    i.proto.vcl_proto(short=True))
-			fo.write("\n")
-			return
-
-		l = []
-		for i in self.vcc.contents[1:]:
-			j = i.rstlbl
-			if j is not None:
-				l.append([j.split("_", 1)[1], j])
-			if i.methods is None:
-				continue
-			for x in i.methods:
-				j = x.rstlbl
-				l.append([j.split("_", 1)[1], j])
-
-		l.sort()
-		for i in l:
-			fo.write("* :ref:`%s`\n" % i[1])
-		fo.write("\n")
+    def parse(self):
+        a = self.line[1].split(None, 2)
+        self.vcc.modname = a[0]
+        self.vcc.mansection = a[1]
+        self.vcc.moddesc = a[2]
+        self.rstlbl = "vmod_%s(%s)" % (
+            self.vcc.modname,
+            self.vcc.mansection
+        )
+        self.vcc.contents.append(self)
+
+    def rsthead(self, fo, man):
+
+        write_rst_hdr(fo, self.vcc.sympfx + self.vcc.modname, "=", "=")
+        fo.write("\n")
+
+        write_rst_hdr(fo, self.vcc.moddesc, "-", "-")
+
+        fo.write("\n")
+        fo.write(":Manual section: " + self.vcc.mansection + "\n")
+
+        fo.write("\n")
+        write_rst_hdr(fo, "SYNOPSIS", "=")
+        fo.write("\n")
+        fo.write('import %s [from "path"] ;\n' % self.vcc.modname)
+        fo.write("\n")
+
+    def rsttail(self, fo, man):
+
+        write_rst_hdr(fo, "CONTENTS", "=")
+        fo.write("\n")
+
+        if man:
+            for i in self.vcc.contents[1:]:
+                if i.rstlbl is None:
+                    continue
+                fo.write("* %s\n" % i.proto.vcl_proto(short=True))
+            fo.write("\n")
+            return
+
+        l = []
+        for i in self.vcc.contents[1:]:
+            j = i.rstlbl
+            if j is not None:
+                l.append([j.split("_", 1)[1], j])
+            if i.methods is None:
+                continue
+            for x in i.methods:
+                j = x.rstlbl
+                l.append([j.split("_", 1)[1], j])
+
+        l.sort()
+        for i in l:
+            fo.write("* :ref:`%s`\n" % i[1])
+        fo.write("\n")
+
 
 class s_abi(stanza):
-	def parse(self):
-		if self.line[1] not in ('strict', 'vrt'):
-			err("Valid ABI types are 'strict' or 'vrt', got '%s'\n" %
-			    self.line[1])
-		strict_abi = self.line[1] == 'strict'
-		self.vcc.contents.append(self)
+    def parse(self):
+        if self.line[1] not in ('strict', 'vrt'):
+            err("Valid ABI types are 'strict' or 'vrt', got '%s'\n" %
+                self.line[1])
+        strict_abi = self.line[1] == 'strict'
+        self.vcc.contents.append(self)
+
 
 class s_prefix(stanza):
-	def parse(self):
-		self.vcc.sympfx = self.line[1] + "_"
-		self.vcc.contents.append(self)
+    def parse(self):
+        self.vcc.sympfx = self.line[1] + "_"
+        self.vcc.contents.append(self)
+
 
 class s_event(stanza):
-	def parse(self):
-		self.event_func = self.line[1]
-		self.vcc.contents.append(self)
+    def parse(self):
+        self.event_func = self.line[1]
+        self.vcc.contents.append(self)
 
-	def rstfile(self, fo, man):
-		if len(self.doc) != 0:
-			err("Not emitting .RST for $Event %s\n" %
-			    self.event_func)
+    def rstfile(self, fo, man):
+        if len(self.doc) != 0:
+            err("Not emitting .RST for $Event %s\n" %
+                self.event_func)
 
-	def hfile(self, fo):
-		fo.write("vmod_event_f %s;\n" % self.event_func)
+    def hfile(self, fo):
+        fo.write("vmod_event_f %s;\n" % self.event_func)
 
-	def cstruct(self, fo):
-		fo.write("\tvmod_event_f\t\t\t*_event;\n")
+    def cstruct(self, fo):
+        fo.write("\tvmod_event_f\t\t\t*_event;\n")
 
-	def cstruct_init(self, fo):
-		fo.write("\t%s,\n" % self.event_func)
+    def cstruct_init(self, fo):
+        fo.write("\t%s,\n" % self.event_func)
+
+    def specstr(self, fo):
+        fo.write('\t"$EVENT\\0"\n\t    "Vmod_%s_Func._event",\n\n' %
+                 self.vcc.modname)
 
-	def specstr(self, fo):
-		fo.write('\t"$EVENT\\0"\n\t    "Vmod_%s_Func._event",\n\n' %
-		    self.vcc.modname)
 
 class s_function(stanza):
-	def parse(self):
-		self.proto = prototype(self)
-		self.rstlbl = "func_" + self.proto.name
-		self.vcc.contents.append(self)
-
-	def hfile(self, fo):
-		fn = self.vcc.sympfx + self.proto.name
-		s = "%s %s(VRT_CTX" % (self.proto.c_ret(), fn)
-		s += self.proto.c_args() + ");"
-		for i in lwrap(s):
-			fo.write(i + "\n")
-
-	def cfile(self, fo):
-		fn = "td_" + self.vcc.modname + "_" + self.proto.name
-		s = "typedef %s %s(VRT_CTX" % (self.proto.c_ret(), fn)
-		s += self.proto.c_args() + ");"
-		for i in lwrap(s):
-			fo.write(i + "\n")
-
-	def cstruct(self, fo):
-		fmt_cstruct(fo, self.vcc.modname, self.proto.cname())
-
-	def cstruct_init(self, fo):
-		fo.write("\t" + self.vcc.sympfx + self.proto.cname() + ",\n")
-
-	def specstr(self, fo):
-		fo.write('\t"$FUNC\\0"\t"%s.%s\\0"\n\n' %
-		    (self.vcc.modname, self.proto.name))
-		self.proto.specstr(fo, 'Vmod_%s_Func.%s' %
-		    (self.vcc.modname, self.proto.cname()), "\t    ")
-		fo.write('\t    "\\0",\n\n')
+    def parse(self):
+        self.proto = prototype(self)
+        self.rstlbl = "func_" + self.proto.name
+        self.vcc.contents.append(self)
+
+    def hfile(self, fo):
+        fn = self.vcc.sympfx + self.proto.name
+        s = "%s %s(VRT_CTX" % (self.proto.c_ret(), fn)
+        s += self.proto.c_args() + ");"
+        for i in lwrap(s):
+            fo.write(i + "\n")
+
+    def cfile(self, fo):
+        fn = "td_" + self.vcc.modname + "_" + self.proto.name
+        s = "typedef %s %s(VRT_CTX" % (self.proto.c_ret(), fn)
+        s += self.proto.c_args() + ");"
+        for i in lwrap(s):
+            fo.write(i + "\n")
+
+    def cstruct(self, fo):
+        fmt_cstruct(fo, self.vcc.modname, self.proto.cname())
+
+    def cstruct_init(self, fo):
+        fo.write("\t" + self.vcc.sympfx + self.proto.cname() + ",\n")
+
+    def specstr(self, fo):
+        fo.write('\t"$FUNC\\0"\t"%s.%s\\0"\n\n' %
+                 (self.vcc.modname, self.proto.name))
+        self.proto.specstr(fo, 'Vmod_%s_Func.%s' %
+                           (self.vcc.modname, self.proto.cname()), "\t    ")
+        fo.write('\t    "\\0",\n\n')
+
 
 class s_object(stanza):
-	def parse(self):
-		self.proto = prototype(self, retval=False)
-		self.rstlbl = "obj_" + self.proto.name
-		self.vcc.contents.append(self)
-		self.methods = []
-
-	def rsthead(self, fo, man):
-		if rstfmt:
-			s = self.proto.vcl_proto(short=False)
-			write_rst_hdr(fo, "new OBJ = " + s, '=')
-		else:
-			write_rst_hdr(fo, self.proto.name, '-')
-			s = "new OBJ = " + self.proto.vcl_proto(short=False)
-			fo.write("\n::\n\n\t%s\n" % s)
-
-		fo.write(self.doc + "\n")
-
-		for i in self.methods:
-			i.rstfile(fo, man)
-
-	def rstmid(self, fo, man):
-		return
-
-	def chfile(self, fo, h):
-		sn = self.vcc.sympfx + self.vcc.modname + "_" + self.proto.name
-		fo.write("struct %s;\n" % sn)
-
-		if h:
-			def p(x):
-				return x + " " + self.vcc.sympfx
-		else:
-			def p(x):
-				return "typedef " + x + \
-				    " td_%s_" % self.vcc.modname
-
-		s = p("VCL_VOID") + "%s__init(VRT_CTX, " % self.proto.name
-		s += "struct %s **, const char *" % sn
-		s += self.proto.c_args() + ");"
-		for i in lwrap(s):
-			fo.write(i + "\n")
-
-		s = p("VCL_VOID")
-		s += "%s__fini(struct %s **);" % (self.proto.name, sn)
-		for i in lwrap(s):
-			fo.write(i + "\n")
-
-		for i in self.methods:
-			cn = i.proto.cname()
-			s = p(i.proto.c_ret())
-			s += "%s(VRT_CTX, struct %s *" % (cn, sn)
-			s += i.proto.c_args() + ");"
-			for i in lwrap(s):
-				fo.write(i + "\n")
-		fo.write("\n")
-
-	def hfile(self, fo):
-		self.chfile(fo, True)
-
-	def cfile(self, fo):
-		self.chfile(fo, False)
-
-	def cstruct(self, fo):
-		fmt_cstruct(fo, self.vcc.modname, self.proto.name + "__init")
-		fmt_cstruct(fo, self.vcc.modname, self.proto.name + "__fini")
-		for i in self.methods:
-			i.cstruct(fo)
-
-	def cstruct_init(self, fo):
-		p = "\t" + self.vcc.sympfx
-		fo.write(p + self.proto.name + "__init,\n")
-		fo.write(p + self.proto.name + "__fini,\n")
-		for i in self.methods:
-			i.cstruct_init(fo)
-		fo.write("\n")
-
-	def specstr(self, fo):
-
-		fo.write('\t"$OBJ\\0"\t"%s.%s\\0"\n\n' %
-		    (self.vcc.modname, self.proto.name))
-
-		fo.write('\t    "struct %s%s_%s\\0"\n' %
-		    (self.vcc.sympfx, self.vcc.modname, self.proto.name))
-		fo.write("\n")
-
-		self.proto.specstr(fo, 'Vmod_%s_Func.%s__init' %
-		    (self.vcc.modname, self.proto.name), '\t    ')
-		fo.write('\t    "\\0"\n\n')
-
-		fo.write('\t    "VOID\\0"\n')
-		fo.write('\t    "Vmod_%s_Func.%s__fini\\0"\n' %
-		    (self.vcc.modname, self.proto.name))
-		fo.write('\t\t"\\0"\n')
-		fo.write('\t    "\\0"\n\n')
-
-		for i in self.methods:
-			i.specstr(fo)
-
-		fo.write('\t    "\\0",\n\n')
-
-	def dump(self):
-		super(s_object, self).dump()
-		for i in self.methods:
-			i.dump()
+    def parse(self):
+        self.proto = prototype(self, retval=False)
+        self.rstlbl = "obj_" + self.proto.name
+        self.vcc.contents.append(self)
+        self.methods = []
+
+    def rsthead(self, fo, man):
+        if rstfmt:
+            s = self.proto.vcl_proto(short=False)
+            write_rst_hdr(fo, "new OBJ = " + s, '=')
+        else:
+            write_rst_hdr(fo, self.proto.name, '-')
+            s = "new OBJ = " + self.proto.vcl_proto(short=False)
+            fo.write("\n::\n\n\t%s\n" % s)
+
+        fo.write(self.doc + "\n")
+
+        for i in self.methods:
+            i.rstfile(fo, man)
+
+    def rstmid(self, fo, man):
+        return
+
+    def chfile(self, fo, h):
+        sn = self.vcc.sympfx + self.vcc.modname + "_" + self.proto.name
+        fo.write("struct %s;\n" % sn)
+
+        if h:
+            def p(x):
+                return x + " " + self.vcc.sympfx
+        else:
+            def p(x):
+                return "typedef " + x + \
+                    " td_%s_" % self.vcc.modname
+
+        s = p("VCL_VOID") + "%s__init(VRT_CTX, " % self.proto.name
+        s += "struct %s **, const char *" % sn
+        s += self.proto.c_args() + ");"
+        for i in lwrap(s):
+            fo.write(i + "\n")
+
+        s = p("VCL_VOID")
+        s += "%s__fini(struct %s **);" % (self.proto.name, sn)
+        for i in lwrap(s):
+            fo.write(i + "\n")
+
+        for i in self.methods:
+            cn = i.proto.cname()
+            s = p(i.proto.c_ret())
+            s += "%s(VRT_CTX, struct %s *" % (cn, sn)
+            s += i.proto.c_args() + ");"
+            for i in lwrap(s):
+                fo.write(i + "\n")
+        fo.write("\n")
+
+    def hfile(self, fo):
+        self.chfile(fo, True)
+
+    def cfile(self, fo):
+        self.chfile(fo, False)
+
+    def cstruct(self, fo):
+        fmt_cstruct(fo, self.vcc.modname, self.proto.name + "__init")
+        fmt_cstruct(fo, self.vcc.modname, self.proto.name + "__fini")
+        for i in self.methods:
+            i.cstruct(fo)
+
+    def cstruct_init(self, fo):
+        p = "\t" + self.vcc.sympfx
+        fo.write(p + self.proto.name + "__init,\n")
+        fo.write(p + self.proto.name + "__fini,\n")
+        for i in self.methods:
+            i.cstruct_init(fo)
+        fo.write("\n")
+
+    def specstr(self, fo):
+
+        fo.write('\t"$OBJ\\0"\t"%s.%s\\0"\n\n' %
+                 (self.vcc.modname, self.proto.name))
+
+        fo.write('\t    "struct %s%s_%s\\0"\n' %
+                 (self.vcc.sympfx, self.vcc.modname, self.proto.name))
+        fo.write("\n")
+
+        self.proto.specstr(fo, 'Vmod_%s_Func.%s__init' %
+                           (self.vcc.modname, self.proto.name), '\t    ')
+        fo.write('\t    "\\0"\n\n')
+
+        fo.write('\t    "VOID\\0"\n')
+        fo.write('\t    "Vmod_%s_Func.%s__fini\\0"\n' %
+                 (self.vcc.modname, self.proto.name))
+        fo.write('\t\t"\\0"\n')
+        fo.write('\t    "\\0"\n\n')
+
+        for i in self.methods:
+            i.specstr(fo)
+
+        fo.write('\t    "\\0",\n\n')
+
+    def dump(self):
+        super(s_object, self).dump()
+        for i in self.methods:
+            i.dump()
+
 
 class s_method(stanza):
-	def parse(self):
-		p = self.vcc.contents[-1]
-		assert type(p) == s_object
-		self.proto = prototype(self, prefix=p.proto.name)
-		self.rstlbl = "func_" + self.proto.name
-		p.methods.append(self)
-
-	def cstruct(self, fo):
-		fmt_cstruct(fo, self.vcc.modname, self.proto.cname())
-
-	def cstruct_init(self, fo):
-		fo.write('\t' + self.vcc.sympfx + self.proto.cname() + ",\n")
-
-	def specstr(self, fo):
-		fo.write('\t    "%s.%s\\0"\n' %
-		    (self.vcc.modname, self.proto.name))
-		self.proto.specstr(fo, 'Vmod_%s_Func.%s' %
-		    (self.vcc.modname, self.proto.cname()), '\t\t')
-		fo.write('\t\t"\\0"\n\n')
+    def parse(self):
+        p = self.vcc.contents[-1]
+        assert type(p) == s_object
+        self.proto = prototype(self, prefix=p.proto.name)
+        self.rstlbl = "func_" + self.proto.name
+        p.methods.append(self)
+
+    def cstruct(self, fo):
+        fmt_cstruct(fo, self.vcc.modname, self.proto.cname())
+
+    def cstruct_init(self, fo):
+        fo.write('\t' + self.vcc.sympfx + self.proto.cname() + ",\n")
+
+    def specstr(self, fo):
+        fo.write('\t    "%s.%s\\0"\n' %
+                 (self.vcc.modname, self.proto.name))
+        self.proto.specstr(fo, 'Vmod_%s_Func.%s' %
+                           (self.vcc.modname, self.proto.cname()), '\t\t')
+        fo.write('\t\t"\\0"\n\n')
 
 #######################################################################
 
+
 class vcc(object):
-	def __init__(self, inputvcc, rstdir, outputprefix):
-		self.inputfile = inputvcc
-		self.rstdir = rstdir
-		self.pfx = outputprefix
-		self.sympfx = "vmod_"
-		self.contents = []
-		self.commit_files = []
-		self.copyright = None
-
-	def commit(self):
-		for i in self.commit_files:
-			os.rename(i + ".tmp", i)
-
-	def parse(self):
-		a = open(self.inputfile, "r").read()
-		a = a.split("\n$")
-		for i in range(len(a)):
-			b = a[i].split("\n", 1)
-			c = b[0].split(None, 1)
-
-			if i == 0:
-				if c[0] == "$Module":
-					s_module(c, b[1:], self)
-				else:
-					self.copyright = a[0]
-				continue
-			if i == 1 and self.copyright is not None:
-				if c[0] != "Module":
-					err("$Module must be first stanze")
-			if c[0] == "Module":
-				s_module(c, b[1:], self)
-			elif c[0] == "Prefix":
-				s_prefix(c, b[1:], self)
-			elif c[0] == "ABI":
-				s_abi(c, b[1:], self)
-			elif c[0] == "Event":
-				s_event(c, b[1:], self)
-			elif c[0] == "Function":
-				s_function(c, b[1:], self)
-			elif c[0] == "Object":
-				s_object(c, b[1:], self)
-			elif c[0] == "Method":
-				s_method(c, b[1:], self)
-			else:
-				err("Unknown stanze $%s" % c[0])
-
-	def rst_copyright(self, fo):
-		write_rst_hdr(fo, "COPYRIGHT", "=")
-		fo.write("\n::\n\n")
-		a = self.copyright
-		a = a.replace("\n#", "\n ")
-		if a[:2] == "#\n":
-			a = a[2:]
-		if a[:3] == "#-\n":
-			a = a[3:]
-		fo.write(a + "\n")
-
-	def rstfile(self, man=False):
-		fn = os.path.join(self.rstdir, "vmod_" + self.modname)
-		if man:
-			fn += ".man"
-		fn += ".rst"
-		self.commit_files.append(fn)
-		fo = open(fn + ".tmp", "w")
-		write_rst_file_warning(fo)
-		fo.write(".. role:: ref(emphasis)\n\n")
-
-		for i in self.contents:
-			i.rstfile(fo, man)
-
-		if self.copyright is not None:
-			self.rst_copyright(fo)
-
-		fo.close()
-
-	def amboilerplate(self):
-		fn = "automake_boilerplate.am"
-		self.commit_files.append(fn)
-		fo = open(fn + ".tmp", "w")
-		fo.write(AMBOILERPLATE.replace("XXX", self.modname))
-		fo.close()
-
-	def hfile(self):
-		fn = self.pfx + ".h"
-		self.commit_files.append(fn)
-		fo = open(fn + ".tmp", "w")
-		write_c_file_warning(fo)
-		fo.write("#ifndef VRT_H_INCLUDED\n")
-		fo.write('#  error "Include vrt.h first"\n')
-		fo.write("#endif\n")
-		fo.write("\n")
-
-		for j in self.contents:
-			j.hfile(fo)
-		fo.close()
-
-	def cstruct(self, fo, csn):
-
-		fo.write("\n%s {\n" % csn)
-		for j in self.contents:
-			j.cstruct(fo)
-		fo.write("};\n")
-
-	def cstruct_init(self, fo, csn):
-		fo.write("\nstatic const %s Vmod_Func = {\n" % csn)
-		for j in self.contents:
-			j.cstruct_init(fo)
-		fo.write("};\n")
-
-	def specstr(self, fo):
-		fo.write("\n/*lint -save -e786 -e840 */\n")
-		fo.write("static const char * const Vmod_Spec[] = {\n")
-
-		for j in self.contents:
-			j.specstr(fo)
-		fo.write("\t0\n")
-		fo.write("};\n")
-		fo.write("/*lint -restore */\n")
-
-	def api(self, fo):
-		for i in (714, 759, 765):
-			fo.write("\n/*lint -esym(%d, Vmod_%s_Data) */\n" % (i, self.modname))
-		fo.write("\nextern const struct vmod_data Vmod_%s_Data;\n" %
-			(self.modname))
-		fo.write("\nconst struct vmod_data Vmod_%s_Data = {\n" %
-		    self.modname)
-		if strict_abi:
-			fo.write("\t.vrt_major =\t0,\n")
-			fo.write("\t.vrt_minor =\t0,\n")
-		else:
-			fo.write("\t.vrt_major =\tVRT_MAJOR_VERSION,\n")
-			fo.write("\t.vrt_minor =\tVRT_MINOR_VERSION,\n")
-		fo.write('\t.name =\t\t"%s",\n' % self.modname)
-		fo.write('\t.func =\t\t&Vmod_Func,\n')
-		fo.write('\t.func_len =\tsizeof(Vmod_Func),\n')
-		fo.write('\t.proto =\tVmod_Proto,\n')
-		fo.write('\t.spec =\t\tVmod_Spec,\n')
-		fo.write('\t.abi =\t\tVMOD_ABI_Version,\n')
-		# NB: Sort of hackish:
-		# Fill file_id with random stuff, so we can tell if
-		# VCC and VRT_Vmod_Init() dlopens the same file
-		#
-		fo.write("\t.file_id =\t\"")
-		for i in range(32):
-			fo.write("%c" % random.randint(0x40, 0x5a))
-		fo.write("\",\n")
-		fo.write("};\n")
-
-	def cfile(self):
-		fn = self.pfx + ".c"
-		self.commit_files.append(fn)
-		fo = open(fn + ".tmp", "w")
-		write_c_file_warning(fo)
-
-		fn2 = fn + ".tmp2"
-
-		fo.write('#include "config.h"\n')
-		fo.write('#include <stdio.h>\n')
-		for i in ["vdef", "vrt", self.pfx, "vmod_abi"]:
-			fo.write('#include "%s.h"\n' % i)
-
-		fo.write("\n")
-
-		fx = open(fn2, "w")
-
-		for i in self.contents:
-			if type(i) == s_object:
-				i.cfile(fo)
-				i.cfile(fx)
-
-		fx.write("/* Functions */\n")
-		for i in self.contents:
-			if type(i) == s_function:
-				i.cfile(fo)
-				i.cfile(fx)
-
-		csn = "Vmod_%s_Func" % self.modname
-
-		self.cstruct(fo, "struct " + csn)
-
-		self.cstruct(fx, "struct " + csn)
-
-		fo.write("\n/*lint -esym(754, Vmod_" + self.modname + "_Func::*) */\n")
-		self.cstruct_init(fo, "struct " + csn)
-
-		fx.close()
-
-		fo.write("\nstatic const char Vmod_Proto[] =\n")
-		fi = open(fn2)
-		for i in fi:
-			fo.write('\t"%s\\n"\n' % i.rstrip())
-		fi.close()
-		fo.write('\t"static struct %s %s;";\n' % (csn, csn))
-
-		os.remove(fn2)
-
-		self.specstr(fo)
-
-		self.api(fo)
-
-		fo.close()
+    def __init__(self, inputvcc, rstdir, outputprefix):
+        self.inputfile = inputvcc
+        self.rstdir = rstdir
+        self.pfx = outputprefix
+        self.sympfx = "vmod_"
+        self.contents = []
+        self.commit_files = []
+        self.copyright = None
+
+    def commit(self):
+        for i in self.commit_files:
+            os.rename(i + ".tmp", i)
+
+    def parse(self):
+        a = open(self.inputfile, "r").read()
+        a = a.split("\n$")
+        for i in range(len(a)):
+            b = a[i].split("\n", 1)
+            c = b[0].split(None, 1)
+
+            if i == 0:
+                if c[0] == "$Module":
+                    s_module(c, b[1:], self)
+                else:
+                    self.copyright = a[0]
+                continue
+            if i == 1 and self.copyright is not None:
+                if c[0] != "Module":
+                    err("$Module must be first stanze")
+            if c[0] == "Module":
+                s_module(c, b[1:], self)
+            elif c[0] == "Prefix":
+                s_prefix(c, b[1:], self)
+            elif c[0] == "ABI":
+                s_abi(c, b[1:], self)
+            elif c[0] == "Event":
+                s_event(c, b[1:], self)
+            elif c[0] == "Function":
+                s_function(c, b[1:], self)
+            elif c[0] == "Object":
+                s_object(c, b[1:], self)
+            elif c[0] == "Method":
+                s_method(c, b[1:], self)
+            else:
+                err("Unknown stanze $%s" % c[0])
+
+    def rst_copyright(self, fo):
+        write_rst_hdr(fo, "COPYRIGHT", "=")
+        fo.write("\n::\n\n")
+        a = self.copyright
+        a = a.replace("\n#", "\n ")
+        if a[:2] == "#\n":
+            a = a[2:]
+        if a[:3] == "#-\n":
+            a = a[3:]
+        fo.write(a + "\n")
+
+    def rstfile(self, man=False):
+        fn = os.path.join(self.rstdir, "vmod_" + self.modname)
+        if man:
+            fn += ".man"
+        fn += ".rst"
+        self.commit_files.append(fn)
+        fo = open(fn + ".tmp", "w")
+        write_rst_file_warning(fo)
+        fo.write(".. role:: ref(emphasis)\n\n")
+
+        for i in self.contents:
+            i.rstfile(fo, man)
+
+        if self.copyright is not None:
+            self.rst_copyright(fo)
+
+        fo.close()
+
+    def amboilerplate(self):
+        fn = "automake_boilerplate.am"
+        self.commit_files.append(fn)
+        fo = open(fn + ".tmp", "w")
+        fo.write(AMBOILERPLATE.replace("XXX", self.modname))
+        fo.close()
+
+    def hfile(self):
+        fn = self.pfx + ".h"
+        self.commit_files.append(fn)
+        fo = open(fn + ".tmp", "w")
+        write_c_file_warning(fo)
+        fo.write("#ifndef VRT_H_INCLUDED\n")
+        fo.write('#  error "Include vrt.h first"\n')
+        fo.write("#endif\n")
+        fo.write("\n")
+
+        for j in self.contents:
+            j.hfile(fo)
+        fo.close()
+
+    def cstruct(self, fo, csn):
+
+        fo.write("\n%s {\n" % csn)
+        for j in self.contents:
+            j.cstruct(fo)
+        fo.write("};\n")
+
+    def cstruct_init(self, fo, csn):
+        fo.write("\nstatic const %s Vmod_Func = {\n" % csn)
+        for j in self.contents:
+            j.cstruct_init(fo)
+        fo.write("};\n")
+
+    def specstr(self, fo):
+        fo.write("\n/*lint -save -e786 -e840 */\n")
+        fo.write("static const char * const Vmod_Spec[] = {\n")
+
+        for j in self.contents:
+            j.specstr(fo)
+        fo.write("\t0\n")
+        fo.write("};\n")
+        fo.write("/*lint -restore */\n")
+
+    def api(self, fo):
+        for i in (714, 759, 765):
+            fo.write("\n/*lint -esym(%d, Vmod_%s_Data) */\n" %
+                     (i, self.modname))
+        fo.write("\nextern const struct vmod_data Vmod_%s_Data;\n" %
+                 (self.modname))
+        fo.write("\nconst struct vmod_data Vmod_%s_Data = {\n" % self.modname)
+        if strict_abi:
+            fo.write("\t.vrt_major =\t0,\n")
+            fo.write("\t.vrt_minor =\t0,\n")
+        else:
+            fo.write("\t.vrt_major =\tVRT_MAJOR_VERSION,\n")
+            fo.write("\t.vrt_minor =\tVRT_MINOR_VERSION,\n")
+        fo.write('\t.name =\t\t"%s",\n' % self.modname)
+        fo.write('\t.func =\t\t&Vmod_Func,\n')
+        fo.write('\t.func_len =\tsizeof(Vmod_Func),\n')
+        fo.write('\t.proto =\tVmod_Proto,\n')
+        fo.write('\t.spec =\t\tVmod_Spec,\n')
+        fo.write('\t.abi =\t\tVMOD_ABI_Version,\n')
+        # NB: Sort of hackish:
+        # Fill file_id with random stuff, so we can tell if
+        # VCC and VRT_Vmod_Init() dlopens the same file
+        #
+        fo.write("\t.file_id =\t\"")
+        for i in range(32):
+            fo.write("%c" % random.randint(0x40, 0x5a))
+        fo.write("\",\n")
+        fo.write("};\n")
+
+    def cfile(self):
+        fn = self.pfx + ".c"
+        self.commit_files.append(fn)
+        fo = open(fn + ".tmp", "w")
+        write_c_file_warning(fo)
+
+        fn2 = fn + ".tmp2"
+
+        fo.write('#include "config.h"\n')
+        fo.write('#include <stdio.h>\n')
+        for i in ["vdef", "vrt", self.pfx, "vmod_abi"]:
+            fo.write('#include "%s.h"\n' % i)
+
+        fo.write("\n")
+
+        fx = open(fn2, "w")
+
+        for i in self.contents:
+            if type(i) == s_object:
+                i.cfile(fo)
+                i.cfile(fx)
+
+        fx.write("/* Functions */\n")
+        for i in self.contents:
+            if type(i) == s_function:
+                i.cfile(fo)
+                i.cfile(fx)
+
+        csn = "Vmod_%s_Func" % self.modname
+
+        self.cstruct(fo, "struct " + csn)
+
+        self.cstruct(fx, "struct " + csn)
+
+        fo.write("\n/*lint -esym(754, Vmod_" + self.modname + "_Func::*) */\n")
+        self.cstruct_init(fo, "struct " + csn)
+
+        fx.close()
+
+        fo.write("\nstatic const char Vmod_Proto[] =\n")
+        fi = open(fn2)
+        for i in fi:
+            fo.write('\t"%s\\n"\n' % i.rstrip())
+        fi.close()
+        fo.write('\t"static struct %s %s;";\n' % (csn, csn))
+
+        os.remove(fn2)
+
+        self.specstr(fo)
+
+        self.api(fo)
+
+        fo.close()
 
 #######################################################################
 
+
 def runmain(inputvcc, rstdir, outputprefix):
 
-	v = vcc(inputvcc, rstdir, outputprefix)
-	v.parse()
+    v = vcc(inputvcc, rstdir, outputprefix)
+    v.parse()
 
-	v.rstfile(man=False)
-	v.rstfile(man=True)
-	v.hfile()
-	v.cfile()
-	if opts.boilerplate:
-		v.amboilerplate()
+    v.rstfile(man=False)
+    v.rstfile(man=True)
+    v.hfile()
+    v.cfile()
+    if opts.boilerplate:
+        v.amboilerplate()
 
-	v.commit()
+    v.commit()
 
 if __name__ == "__main__":
-	usagetext = "Usage: %prog [options] <vmod.vcc>"
-	oparser = optparse.OptionParser(usage=usagetext)
-
-	oparser.add_option('-b', '--boilerplate', action='store_true',
-	    default=False,
-	    help="Be strict when parsing the input file")
-	oparser.add_option('-N', '--strict', action='store_true', default=False,
-	    help="Be strict when parsing the input file")
-	oparser.add_option('-o', '--output', metavar="prefix", default='vcc_if',
-	    help='Output file prefix (default: "vcc_if")')
-	oparser.add_option('-w', '--rstdir', metavar="directory", default='.',
-	    help='Where to save the generated RST files (default: ".")')
-	oparser.add_option('', '--runtests', action='store_true', default=False,
-	    dest="runtests", help=optparse.SUPPRESS_HELP)
-	(opts, args) = oparser.parse_args()
-
-	if opts.runtests:
-		# Pop off --runtests, pass remaining to unittest.
-		del sys.argv[1]
-		unittest.main()
-		exit()
-
-	i_vcc = None
-	if len(args) == 1 and os.path.exists(args[0]):
-		i_vcc = args[0]
-	elif os.path.exists("vmod.vcc"):
-		if not i_vcc:
-			i_vcc = "vmod.vcc"
-	else:
-		print("ERROR: No vmod.vcc file supplied or found.",
-		    file=sys.stderr)
-		oparser.print_help()
-		exit(-1)
-
-	runmain(i_vcc, opts.rstdir, opts.output)
+    usagetext = "Usage: %prog [options] <vmod.vcc>"
+    oparser = optparse.OptionParser(usage=usagetext)
+
+    oparser.add_option('-b', '--boilerplate', action='store_true',
+                       default=False,
+                       help="Be strict when parsing the input file")
+    oparser.add_option('-N', '--strict', action='store_true', default=False,
+                       help="Be strict when parsing the input file")
+    oparser.add_option('-o', '--output', metavar="prefix", default='vcc_if',
+                       help='Output file prefix (default: "vcc_if")')
+    oparser.add_option('-w', '--rstdir', metavar="directory", default='.',
+                       help='Where to save the generated RST files ' +
+                            '(default: ".")')
+    oparser.add_option('', '--runtests', action='store_true', default=False,
+                       dest="runtests", help=optparse.SUPPRESS_HELP)
+    (opts, args) = oparser.parse_args()
+
+    if opts.runtests:
+        # Pop off --runtests, pass remaining to unittest.
+        del sys.argv[1]
+        unittest.main()
+        exit()
+
+    i_vcc = None
+    if len(args) == 1 and os.path.exists(args[0]):
+        i_vcc = args[0]
+    elif os.path.exists("vmod.vcc"):
+        if not i_vcc:
+            i_vcc = "vmod.vcc"
+    else:
+        print("ERROR: No vmod.vcc file supplied or found.", file=sys.stderr)
+        oparser.print_help()
+        exit(-1)
+
+    runmain(i_vcc, opts.rstdir, opts.output)

From phk at FreeBSD.org  Mon Nov  6 07:41:08 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Mon,  6 Nov 2017 07:41:08 +0000 (UTC)
Subject: [master] f4fcd0d Simplify
Message-ID: <20171106074108.CB35C623F0@lists.varnish-cache.org>


commit f4fcd0d5b147c9bc892a02872269beaa659690e0
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Fri Nov 3 09:06:41 2017 +0000

    Simplify

diff --git a/lib/libvcc/vmodtool.py b/lib/libvcc/vmodtool.py
index 7d26668..1b5aaad 100755
--- a/lib/libvcc/vmodtool.py
+++ b/lib/libvcc/vmodtool.py
@@ -52,9 +52,9 @@ AMBOILERPLATE = '''
 AM_LDFLAGS  = $(AM_LT_LDFLAGS)
 
 AM_CPPFLAGS = \\
-    -I$(top_srcdir)/include \\
-    -I$(top_srcdir)/bin/varnishd \\
-    -I$(top_builddir)/include
+\t-I$(top_srcdir)/include \\
+\t-I$(top_srcdir)/bin/varnishd \\
+\t-I$(top_builddir)/include
 
 vmoddir = $(pkglibdir)/vmods
 vmodtool = $(top_srcdir)/lib/libvcc/vmodtool.py
@@ -63,12 +63,12 @@ vmodtoolargs = --strict --boilerplate
 vmod_LTLIBRARIES = libvmod_XXX.la
 
 libvmod_XXX_la_CFLAGS = \\
-    @SAN_CFLAGS@
+\t at SAN_CFLAGS@
 
 libvmod_XXX_la_LDFLAGS = \\
-    $(AM_LDFLAGS) \\
-    $(VMOD_LDFLAGS) \\
-    @SAN_LDFLAGS@
+\t$(AM_LDFLAGS) \\
+\t$(VMOD_LDFLAGS) \\
+\t at SAN_LDFLAGS@
 
 nodist_libvmod_XXX_la_SOURCES = vcc_if.c vcc_if.h
 
@@ -79,13 +79,13 @@ $(libvmod_XXX_la_OBJECTS): vcc_if.h
 vcc_if.h vmod_XXX.rst vmod_XXX.man.rst: vcc_if.c
 
 vcc_if.c: $(vmodtool) $(srcdir)/vmod.vcc
-    @PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/vmod.vcc
+\t at PYTHON@ $(vmodtool) $(vmodtoolargs) $(srcdir)/vmod.vcc
 
 EXTRA_DIST = vmod.vcc automake_boilerplate.am
 
 CLEANFILES = $(builddir)/vcc_if.c $(builddir)/vcc_if.h \\
-    $(builddir)/vmod_XXX.rst \\
-    $(builddir)/vmod_XXX.man.rst
+\t$(builddir)/vmod_XXX.rst \\
+\t$(builddir)/vmod_XXX.man.rst
 
 '''
 
@@ -695,6 +695,16 @@ class s_method(stanza):
 
 #######################################################################
 
+dispatch = {
+    "Module":	s_module,
+    "Prefix":	s_prefix,
+    "ABI":	s_abi,
+    "Event":	s_event,
+    "Function":	s_function,
+    "Object":	s_object,
+    "Method":	s_method,
+}
+
 
 class vcc(object):
     def __init__(self, inputvcc, rstdir, outputprefix):
@@ -704,44 +714,30 @@ class vcc(object):
         self.sympfx = "vmod_"
         self.contents = []
         self.commit_files = []
-        self.copyright = None
+        self.copyright = ""
+
+    def openfile(self, fn):
+        self.commit_files.append(fn)
+        return open(fn + ".tmp", "w")
 
     def commit(self):
         for i in self.commit_files:
             os.rename(i + ".tmp", i)
 
     def parse(self):
-        a = open(self.inputfile, "r").read()
-        a = a.split("\n$")
-        for i in range(len(a)):
-            b = a[i].split("\n", 1)
+        a = "\n" + open(self.inputfile, "r").read()
+        s = a.split("\n$")
+        self.copyright = s.pop(0).strip()
+        for i in range(len(s)):
+            b = s[i].split("\n", 1)
             c = b[0].split(None, 1)
 
-            if i == 0:
-                if c[0] == "$Module":
-                    s_module(c, b[1:], self)
-                else:
-                    self.copyright = a[0]
-                continue
-            if i == 1 and self.copyright is not None:
-                if c[0] != "Module":
-                    err("$Module must be first stanze")
-            if c[0] == "Module":
-                s_module(c, b[1:], self)
-            elif c[0] == "Prefix":
-                s_prefix(c, b[1:], self)
-            elif c[0] == "ABI":
-                s_abi(c, b[1:], self)
-            elif c[0] == "Event":
-                s_event(c, b[1:], self)
-            elif c[0] == "Function":
-                s_function(c, b[1:], self)
-            elif c[0] == "Object":
-                s_object(c, b[1:], self)
-            elif c[0] == "Method":
-                s_method(c, b[1:], self)
-            else:
+            if i == 0 and c[0] != "Module":
+                err("$Module must be first stanze", False)
+            m = dispatch.get(c[0])
+            if m is None:
                 err("Unknown stanze $%s" % c[0])
+            m(c, b[1:], self)
 
     def rst_copyright(self, fo):
         write_rst_hdr(fo, "COPYRIGHT", "=")
@@ -759,30 +755,27 @@ class vcc(object):
         if man:
             fn += ".man"
         fn += ".rst"
-        self.commit_files.append(fn)
-        fo = open(fn + ".tmp", "w")
+        fo = self.openfile(fn)
         write_rst_file_warning(fo)
         fo.write(".. role:: ref(emphasis)\n\n")
 
         for i in self.contents:
             i.rstfile(fo, man)
 
-        if self.copyright is not None:
+        if len(self.copyright):
             self.rst_copyright(fo)
 
         fo.close()
 
     def amboilerplate(self):
         fn = "automake_boilerplate.am"
-        self.commit_files.append(fn)
-        fo = open(fn + ".tmp", "w")
+        fo = self.openfile(fn)
         fo.write(AMBOILERPLATE.replace("XXX", self.modname))
         fo.close()
 
     def hfile(self):
         fn = self.pfx + ".h"
-        self.commit_files.append(fn)
-        fo = open(fn + ".tmp", "w")
+        fo = self.openfile(fn)
         write_c_file_warning(fo)
         fo.write("#ifndef VRT_H_INCLUDED\n")
         fo.write('#  error "Include vrt.h first"\n')
@@ -847,8 +840,7 @@ class vcc(object):
 
     def cfile(self):
         fn = self.pfx + ".c"
-        self.commit_files.append(fn)
-        fo = open(fn + ".tmp", "w")
+        fo = self.openfile(fn)
         write_c_file_warning(fo)
 
         fn2 = fn + ".tmp2"

From phk at FreeBSD.org  Mon Nov  6 07:49:05 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Mon,  6 Nov 2017 07:49:05 +0000 (UTC)
Subject: [master] f78a90b Various nitpicking
Message-ID: <20171106074905.5F9CB62A7B@lists.varnish-cache.org>


commit f78a90b824e1f540750f6e60d86b301d0a69aab2
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Nov 6 07:47:55 2017 +0000

    Various nitpicking

diff --git a/bin/varnishtest/vtc_process.c b/bin/varnishtest/vtc_process.c
index 3145c58..1f80adc 100644
--- a/bin/varnishtest/vtc_process.c
+++ b/bin/varnishtest/vtc_process.c
@@ -174,6 +174,7 @@ process_thread(void *priv)
 	CAST_OBJ_NOTNULL(p, priv, PROCESS_MAGIC);
 	if (p->fd_from > 0) {
 		vlu = VLU_New(p, process_vlu_func, 1024);
+		AN(vlu);
 		while (!VLU_Fd(p->fd_from, vlu))
 			continue;
 		VLU_Destroy(vlu);
diff --git a/lib/libvarnish/vcli_serve.c b/lib/libvarnish/vcli_serve.c
index cb40ea9..2196388 100644
--- a/lib/libvarnish/vcli_serve.c
+++ b/lib/libvarnish/vcli_serve.c
@@ -432,12 +432,13 @@ VCLS_AddFd(struct VCLS *cs, int fdi, int fdo, cls_cb_f *closefunc, void *priv)
 	cfd->cli = &cfd->clis;
 	cfd->cli->magic = CLI_MAGIC;
 	cfd->cli->vlu = VLU_New(cfd, cls_vlu, *cs->maxlen);
+	AN(cfd->cli->vlu);
 	cfd->cli->sb = VSB_new_auto();
+	AN(cfd->cli->sb);
 	cfd->cli->limit = cs->limit;
 	cfd->cli->priv = priv;
 	cfd->closefunc = closefunc;
 	cfd->priv = priv;
-	AN(cfd->cli->sb);
 	VTAILQ_INSERT_TAIL(&cs->fds, cfd, list);
 	cs->nfd++;
 	return (cfd->cli);
diff --git a/lib/libvarnish/vsub.c b/lib/libvarnish/vsub.c
index e3f7453..9881b0d 100644
--- a/lib/libvarnish/vsub.c
+++ b/lib/libvarnish/vsub.c
@@ -127,6 +127,7 @@ VSUB_run(struct vsb *sb, vsub_func_f *func, void *priv, const char *name,
 	}
 	closefd(&p[1]);
 	vlu = VLU_New(&sp, vsub_vlu, 0);
+	AN(vlu);
 	while (!VLU_Fd(p[0], vlu))
 		continue;
 	closefd(&p[0]);
diff --git a/lib/libvcc/vcc_expr.c b/lib/libvcc/vcc_expr.c
index 17636da..bbe3a16 100644
--- a/lib/libvcc/vcc_expr.c
+++ b/lib/libvcc/vcc_expr.c
@@ -712,9 +712,7 @@ vcc_Eval_Func(struct vcc *tl, const char *spec,
     const char *extra, const struct symbol *sym)
 {
 	struct expr *e = NULL;
-	struct token *t1;
 
-	t1 = tl->t;
 	vcc_func(tl, &e, spec, extra, sym);
 	ERRCHK(tl);
 	vcc_expr_fmt(tl->fb, tl->indent, e);

From phk at FreeBSD.org  Mon Nov  6 09:44:06 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Mon,  6 Nov 2017 09:44:06 +0000 (UTC)
Subject: [master] d0eb0f1 Get rid of VCLS_Poll(), we don't need it.
Message-ID: <20171106094406.68F0061B5C@lists.varnish-cache.org>


commit d0eb0f1526d627feb1886ba673e3008dbe13dfdf
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Nov 6 09:12:49 2017 +0000

    Get rid of VCLS_Poll(), we don't need it.

diff --git a/bin/varnishd/cache/cache_cli.c b/bin/varnishd/cache/cache_cli.c
index 066398b..343a576 100644
--- a/bin/varnishd/cache/cache_cli.c
+++ b/bin/varnishd/cache/cache_cli.c
@@ -99,8 +99,8 @@ CLI_Run(void)
 	AN(VCLS_AddFd(cls, heritage.cli_in, heritage.cli_out, NULL, NULL));
 
 	do {
-		i = VCLS_Poll(cls, -1);
-	} while (i > 0);
+		i = VCLS_PollFd(cls, heritage.cli_in, -1);
+	} while (i == 0);
 	VSL(SLT_CLI, 0, "EOF on CLI connection, worker stops");
 }
 
diff --git a/include/vcli_serve.h b/include/vcli_serve.h
index 994de9d..ddaaa61 100644
--- a/include/vcli_serve.h
+++ b/include/vcli_serve.h
@@ -97,7 +97,6 @@ struct VCLS *VCLS_New(cls_cbc_f *before, cls_cbc_f *after,
 struct cli *VCLS_AddFd(struct VCLS *cs, int fdi, int fdo, cls_cb_f *closefunc,
     void *priv);
 void VCLS_AddFunc(struct VCLS *cs, unsigned auth, struct cli_proto *clp);
-int VCLS_Poll(struct VCLS *cs, int timeout);
 int VCLS_PollFd(struct VCLS *cs, int fd, int timeout);
 void VCLS_Destroy(struct VCLS **);
 void VCLS_Clone(struct VCLS *cs, struct VCLS *cso);
diff --git a/lib/libvarnish/vcli_serve.c b/lib/libvarnish/vcli_serve.c
index aff32a2..a26c50b 100644
--- a/lib/libvarnish/vcli_serve.c
+++ b/lib/libvarnish/vcli_serve.c
@@ -558,49 +558,6 @@ VCLS_PollFd(struct VCLS *cs, int fd, int timeout)
 	return (k);
 }
 
-int
-VCLS_Poll(struct VCLS *cs, int timeout)
-{
-	struct VCLS_fd *cfd, *cfd2;
-	int i, j, k;
-
-	CHECK_OBJ_NOTNULL(cs, VCLS_MAGIC);
-	if (cs->nfd == 0) {
-		errno = 0;
-		return (-1);
-	}
-	assert(cs->nfd > 0);
-	{
-		struct pollfd pfd[cs->nfd];
-
-		i = 0;
-		VTAILQ_FOREACH(cfd, &cs->fds, list) {
-			pfd[i].fd = cfd->fdi;
-			pfd[i].events = POLLIN;
-			pfd[i].revents = 0;
-			i++;
-		}
-		assert(i == cs->nfd);
-
-		j = poll(pfd, cs->nfd, timeout);
-		if (j <= 0)
-			return (j);
-		i = 0;
-		VTAILQ_FOREACH_SAFE(cfd, &cs->fds, list, cfd2) {
-			assert(pfd[i].fd == cfd->fdi);
-			if (pfd[i].revents & POLLHUP)
-				k = 1;
-			else
-				k = VLU_Fd(cfd->cli->vlu, cfd->fdi);
-			if (k)
-				cls_close_fd(cs, cfd);
-			i++;
-		}
-		assert(i == j);
-	}
-	return (j);
-}
-
 void
 VCLS_Destroy(struct VCLS **csp)
 {

From phk at FreeBSD.org  Mon Nov  6 09:44:06 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Mon,  6 Nov 2017 09:44:06 +0000 (UTC)
Subject: [master] 1b42934 Renovate the VLU API (Inspired by #2481)
Message-ID: <20171106094406.5528361B5A@lists.varnish-cache.org>


commit 1b42934877a5cde698ca080e0a490ab426965952
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Nov 6 08:06:06 2017 +0000

    Renovate the VLU API (Inspired by #2481)

diff --git a/bin/varnishd/mgt/mgt_child.c b/bin/varnishd/mgt/mgt_child.c
index 3174cde..0c2eb11 100644
--- a/bin/varnishd/mgt/mgt_child.c
+++ b/bin/varnishd/mgt/mgt_child.c
@@ -221,7 +221,7 @@ static int __match_proto__(vev_cb_f)
 child_listener(const struct vev *e, int what)
 {
 
-	if ((what & ~EV_RD) || VLU_Fd(child_output, child_std_vlu)) {
+	if ((what & ~EV_RD) || VLU_Fd(child_std_vlu, child_output)) {
 		ev_listen = NULL;
 		if (e != NULL)
 			mgt_reap_child();
@@ -361,7 +361,7 @@ mgt_launch_child(struct cli *cli)
 	MCH_Fd_Inherit(heritage.cli_out, NULL);
 	closefd(&heritage.cli_out);
 
-	child_std_vlu = VLU_New(NULL, child_line, 0);
+	child_std_vlu = VLU_New(child_line, NULL, 0);
 	AN(child_std_vlu);
 
 	AZ(ev_listen);
@@ -515,7 +515,7 @@ mgt_reap_child(void)
 	/* Pick up any stuff lingering on stdout/stderr */
 	(void)child_listener(NULL, EV_RD);
 	closefd(&child_output);
-	VLU_Destroy(child_std_vlu);
+	VLU_Destroy(&child_std_vlu);
 
 	child_pid = -1;
 
diff --git a/bin/varnishtest/vtc_process.c b/bin/varnishtest/vtc_process.c
index 1f80adc..cb168eb 100644
--- a/bin/varnishtest/vtc_process.c
+++ b/bin/varnishtest/vtc_process.c
@@ -169,16 +169,10 @@ process_thread(void *priv)
 	struct process *p;
 	struct rusage ru;
 	int r;
-	struct vlu *vlu;
 
 	CAST_OBJ_NOTNULL(p, priv, PROCESS_MAGIC);
-	if (p->fd_from > 0) {
-		vlu = VLU_New(p, process_vlu_func, 1024);
-		AN(vlu);
-		while (!VLU_Fd(p->fd_from, vlu))
-			continue;
-		VLU_Destroy(vlu);
-	}
+	if (p->fd_from > 0)
+		(void)VLU_File(p->fd_from, process_vlu_func, p, 1024);
 	r = wait4(p->pid, &p->status, 0, &ru);
 
 	AZ(pthread_mutex_lock(&p->mtx));
diff --git a/include/vlu.h b/include/vlu.h
index 1b5cd4a..f92642e 100644
--- a/include/vlu.h
+++ b/include/vlu.h
@@ -27,11 +27,13 @@
  * a function on each.
  */
 
-#ifndef VLU_H_INCLUDED
+#ifdef VLU_H_INCLUDED
+#  error "vlu.h included multiple times"
+#endif
 #define VLU_H_INCLUDED
 
 typedef int (vlu_f)(void *, const char *);
-struct vlu *VLU_New(void *priv, vlu_f *func, unsigned bufsize);
-int VLU_Fd(int fd, struct vlu *l);
-void VLU_Destroy(struct vlu *l);
-#endif
+struct vlu *VLU_New(vlu_f *, void *, unsigned);
+int VLU_Fd(struct vlu *, int);
+void VLU_Destroy(struct vlu **);
+int VLU_File(int, vlu_f *, void *, unsigned);
diff --git a/lib/libvarnish/vcli_serve.c b/lib/libvarnish/vcli_serve.c
index 2196388..aff32a2 100644
--- a/lib/libvarnish/vcli_serve.c
+++ b/lib/libvarnish/vcli_serve.c
@@ -431,7 +431,7 @@ VCLS_AddFd(struct VCLS *cs, int fdi, int fdo, cls_cb_f *closefunc, void *priv)
 	cfd->fdo = fdo;
 	cfd->cli = &cfd->clis;
 	cfd->cli->magic = CLI_MAGIC;
-	cfd->cli->vlu = VLU_New(cfd, cls_vlu, *cs->maxlen);
+	cfd->cli->vlu = VLU_New(cls_vlu, cfd, *cs->maxlen);
 	AN(cfd->cli->vlu);
 	cfd->cli->sb = VSB_new_auto();
 	AN(cfd->cli->sb);
@@ -453,7 +453,7 @@ cls_close_fd(struct VCLS *cs, struct VCLS_fd *cfd)
 
 	VTAILQ_REMOVE(&cs->fds, cfd, list);
 	cs->nfd--;
-	VLU_Destroy(cfd->cli->vlu);
+	VLU_Destroy(&cfd->cli->vlu);
 	VSB_destroy(&cfd->cli->sb);
 	if (cfd->closefunc == NULL) {
 		(void)close(cfd->fdi);
@@ -552,7 +552,7 @@ VCLS_PollFd(struct VCLS *cs, int fd, int timeout)
 	if (pfd[0].revents & POLLHUP)
 		k = 1;
 	else
-		k = VLU_Fd(cfd->fdi, cfd->cli->vlu);
+		k = VLU_Fd(cfd->cli->vlu, cfd->fdi);
 	if (k)
 		cls_close_fd(cs, cfd);
 	return (k);
@@ -591,7 +591,7 @@ VCLS_Poll(struct VCLS *cs, int timeout)
 			if (pfd[i].revents & POLLHUP)
 				k = 1;
 			else
-				k = VLU_Fd(cfd->fdi, cfd->cli->vlu);
+				k = VLU_Fd(cfd->cli->vlu, cfd->fdi);
 			if (k)
 				cls_close_fd(cs, cfd);
 			i++;
diff --git a/lib/libvarnish/vlu.c b/lib/libvarnish/vlu.c
index 7a9672e..a636804 100644
--- a/lib/libvarnish/vlu.c
+++ b/lib/libvarnish/vlu.c
@@ -50,7 +50,7 @@ struct vlu {
 };
 
 struct vlu *
-VLU_New(void *priv, vlu_f *func, unsigned bufsize)
+VLU_New(vlu_f *func, void *priv, unsigned bufsize)
 {
 	struct vlu *l;
 
@@ -71,9 +71,13 @@ VLU_New(void *priv, vlu_f *func, unsigned bufsize)
 }
 
 void
-VLU_Destroy(struct vlu *l)
+VLU_Destroy(struct vlu **lp)
 {
+	struct vlu *l;
 
+	AN(lp);
+	l = *lp;
+	*lp = NULL;
 	CHECK_OBJ_NOTNULL(l, LINEUP_MAGIC);
 	free(l->buf);
 	FREE_OBJ(l);
@@ -111,7 +115,7 @@ LineUpProcess(struct vlu *l)
 }
 
 int
-VLU_Fd(int fd, struct vlu *l)
+VLU_Fd(struct vlu *l, int fd)
 {
 	int i;
 
@@ -122,3 +126,18 @@ VLU_Fd(int fd, struct vlu *l)
 	l->bufp += i;
 	return (LineUpProcess(l));
 }
+
+int
+VLU_File(int fd, vlu_f *func, void *priv, unsigned bufsize)
+{
+	struct vlu *vlu;
+	int i;
+
+	vlu = VLU_New(func, priv, bufsize);
+	AN(vlu);
+	do {
+		i = VLU_Fd(vlu, fd);
+	} while (i == 0);
+	VLU_Destroy(&vlu);
+	return (i);
+}
diff --git a/lib/libvarnish/vsub.c b/lib/libvarnish/vsub.c
index 9881b0d..48f56d7 100644
--- a/lib/libvarnish/vsub.c
+++ b/lib/libvarnish/vsub.c
@@ -89,7 +89,6 @@ VSUB_run(struct vsb *sb, vsub_func_f *func, void *priv, const char *name,
 {
 	int rv, p[2], status;
 	pid_t pid;
-	struct vlu *vlu;
 	struct vsub_priv sp;
 
 	sp.sb = sb;
@@ -126,12 +125,7 @@ VSUB_run(struct vsb *sb, vsub_func_f *func, void *priv, const char *name,
 		_exit(4);
 	}
 	closefd(&p[1]);
-	vlu = VLU_New(&sp, vsub_vlu, 0);
-	AN(vlu);
-	while (!VLU_Fd(p[0], vlu))
-		continue;
-	closefd(&p[0]);
-	VLU_Destroy(vlu);
+	(void)VLU_File(p[0], vsub_vlu, &sp, 0);
 	if (sp.maxlines >= 0 && sp.lines > sp.maxlines)
 		VSB_printf(sb, "[%d lines truncated]\n",
 		    sp.lines - sp.maxlines);

From phk at FreeBSD.org  Mon Nov  6 11:13:06 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Mon,  6 Nov 2017 11:13:06 +0000 (UTC)
Subject: [master] 4aeb4f6 Simplify the mgt->child handover of CLI setup
Message-ID: <20171106111306.83C9A61B35@lists.varnish-cache.org>


commit 4aeb4f63aec4525d1d5f00c4eae3da72801a3bfa
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Nov 6 11:12:17 2017 +0000

    Simplify the mgt->child handover of CLI setup

diff --git a/bin/varnishd/cache/cache_cli.c b/bin/varnishd/cache/cache_cli.c
index 343a576..b674147 100644
--- a/bin/varnishd/cache/cache_cli.c
+++ b/bin/varnishd/cache/cache_cli.c
@@ -44,7 +44,7 @@
 pthread_t		cli_thread;
 static struct lock	cli_mtx;
 static int		add_check;
-static struct VCLS	*cls;
+static struct VCLS	*cache_cls;
 
 /*
  * The CLI commandlist is split in three:
@@ -64,7 +64,7 @@ CLI_AddFuncs(struct cli_proto *p)
 
 	AZ(add_check);
 	Lck_Lock(&cli_mtx);
-	VCLS_AddFunc(cls, 0, p);
+	VCLS_AddFunc(cache_cls, 0, p);
 	Lck_Unlock(&cli_mtx);
 }
 
@@ -96,10 +96,10 @@ CLI_Run(void)
 
 	add_check = 1;
 
-	AN(VCLS_AddFd(cls, heritage.cli_in, heritage.cli_out, NULL, NULL));
+	AN(VCLS_AddFd(cache_cls, heritage.cli_in, heritage.cli_out, NULL, NULL));
 
 	do {
-		i = VCLS_PollFd(cls, heritage.cli_in, -1);
+		i = VCLS_PollFd(cache_cls, heritage.cli_in, -1);
 	} while (i == 0);
 	VSL(SLT_CLI, 0, "EOF on CLI connection, worker stops");
 }
@@ -123,10 +123,9 @@ CLI_Init(void)
 	Lck_New(&cli_mtx, lck_cli);
 	cli_thread = pthread_self();
 
-	cls = VCLS_New(cli_cb_before, cli_cb_after,
-	    &cache_param->cli_buffer, &cache_param->cli_limit);
-	AN(cls);
-	VCLS_Clone(cls, heritage.cls);
+	cache_cls = heritage.cls;
+	AN(cache_cls);
+	VCLS_SetHooks(cache_cls, cli_cb_before, cli_cb_after);
 
 	CLI_AddFuncs(cli_cmds);
 }
diff --git a/bin/varnishd/mgt/mgt_cli.c b/bin/varnishd/mgt/mgt_cli.c
index dd031ed..720bfea 100644
--- a/bin/varnishd/mgt/mgt_cli.c
+++ b/bin/varnishd/mgt/mgt_cli.c
@@ -364,9 +364,9 @@ void
 mgt_cli_init_cls(void)
 {
 
-	mgt_cls = VCLS_New(mgt_cli_cb_before, mgt_cli_cb_after,
-	    &mgt_param.cli_buffer, &mgt_param.cli_limit);
+	mgt_cls = VCLS_New(&mgt_param.cli_buffer, &mgt_param.cli_limit);
 	AN(mgt_cls);
+	VCLS_SetHooks(mgt_cls, mgt_cli_cb_before, mgt_cli_cb_after);
 	VCLS_AddFunc(mgt_cls, MCF_NOAUTH, cli_auth);
 	VCLS_AddFunc(mgt_cls, MCF_AUTH, cli_proto);
 	VCLS_AddFunc(mgt_cls, MCF_AUTH, cli_debug);
diff --git a/include/vcli_serve.h b/include/vcli_serve.h
index ddaaa61..a1e6bb3 100644
--- a/include/vcli_serve.h
+++ b/include/vcli_serve.h
@@ -92,14 +92,13 @@ void VCLI_SetResult(struct cli *cli, unsigned r);
 
 typedef void cls_cb_f(void *priv);
 typedef void cls_cbc_f(const struct cli*);
-struct VCLS *VCLS_New(cls_cbc_f *before, cls_cbc_f *after,
-    volatile unsigned *maxlen, volatile unsigned *limit);
+struct VCLS *VCLS_New(volatile unsigned *maxlen, volatile unsigned *limit);
+void VCLS_SetHooks(struct VCLS *, cls_cbc_f *, cls_cbc_f *);
 struct cli *VCLS_AddFd(struct VCLS *cs, int fdi, int fdo, cls_cb_f *closefunc,
     void *priv);
 void VCLS_AddFunc(struct VCLS *cs, unsigned auth, struct cli_proto *clp);
 int VCLS_PollFd(struct VCLS *cs, int fd, int timeout);
 void VCLS_Destroy(struct VCLS **);
-void VCLS_Clone(struct VCLS *cs, struct VCLS *cso);
 
 /* From libvarnish/cli.c */
 cli_func_t	VCLS_func_close;
diff --git a/lib/libvarnish/vcli_serve.c b/lib/libvarnish/vcli_serve.c
index a26c50b..626ec3a 100644
--- a/lib/libvarnish/vcli_serve.c
+++ b/lib/libvarnish/vcli_serve.c
@@ -400,8 +400,7 @@ cls_vlu(void *priv, const char *p)
 }
 
 struct VCLS *
-VCLS_New(cls_cbc_f *before, cls_cbc_f *after, volatile unsigned *maxlen,
-    volatile unsigned *limit)
+VCLS_New(volatile unsigned *maxlen, volatile unsigned *limit)
 {
 	struct VCLS *cs;
 
@@ -409,13 +408,20 @@ VCLS_New(cls_cbc_f *before, cls_cbc_f *after, volatile unsigned *maxlen,
 	AN(cs);
 	VTAILQ_INIT(&cs->fds);
 	VTAILQ_INIT(&cs->funcs);
-	cs->before = before;
-	cs->after = after;
 	cs->maxlen = maxlen;
 	cs->limit = limit;
 	return (cs);
 }
 
+void
+VCLS_SetHooks(struct VCLS *cs, cls_cbc_f *before, cls_cbc_f *after)
+{
+
+	CHECK_OBJ_NOTNULL(cs, VCLS_MAGIC);
+	cs->before = before;
+	cs->after = after;
+}
+
 struct cli *
 VCLS_AddFd(struct VCLS *cs, int fdi, int fdo, cls_cb_f *closefunc, void *priv)
 {
@@ -499,26 +505,6 @@ VCLS_AddFunc(struct VCLS *cs, unsigned auth, struct cli_proto *clp)
 	}
 }
 
-/*
- * This function has *very* special semantics, related to the mgt/worker
- * process Copy-On-Write memory relationship.
- */
-
-void
-VCLS_Clone(struct VCLS *cs, struct VCLS *cso)
-{
-	struct cli_proto *clp, *clp2;
-
-	CHECK_OBJ_NOTNULL(cs, VCLS_MAGIC);
-	CHECK_OBJ_NOTNULL(cso, VCLS_MAGIC);
-	VTAILQ_FOREACH_SAFE(clp, &cso->funcs, list, clp2) {
-		VTAILQ_REMOVE(&cso->funcs, clp, list);
-		VTAILQ_INSERT_TAIL(&cs->funcs, clp, list);
-		clp->auth = 0;
-		clp->func = NULL;
-	}
-}
-
 int
 VCLS_PollFd(struct VCLS *cs, int fd, int timeout)
 {

From phk at FreeBSD.org  Mon Nov  6 11:30:09 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Mon,  6 Nov 2017 11:30:09 +0000 (UTC)
Subject: [master] 041e8c8 Change&Rename VCLS_PollFd() to take struct cli
 argument instead of fd.
Message-ID: <20171106113009.7CB596118E@lists.varnish-cache.org>


commit 041e8c81f60bb521caa2d7b68de86e87fcd12bd8
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Nov 6 11:28:44 2017 +0000

    Change&Rename VCLS_PollFd() to take struct cli argument instead of fd.

diff --git a/bin/varnishd/cache/cache_cli.c b/bin/varnishd/cache/cache_cli.c
index b674147..d597f42 100644
--- a/bin/varnishd/cache/cache_cli.c
+++ b/bin/varnishd/cache/cache_cli.c
@@ -93,13 +93,16 @@ void
 CLI_Run(void)
 {
 	int i;
+	struct cli *cli;
 
 	add_check = 1;
 
-	AN(VCLS_AddFd(cache_cls, heritage.cli_in, heritage.cli_out, NULL, NULL));
+	cli = VCLS_AddFd(cache_cls,
+	    heritage.cli_in, heritage.cli_out, NULL, NULL);
+	AN(cli);
 
 	do {
-		i = VCLS_PollFd(cache_cls, heritage.cli_in, -1);
+		i = VCLS_Poll(cache_cls, cli, -1);
 	} while (i == 0);
 	VSL(SLT_CLI, 0, "EOF on CLI connection, worker stops");
 }
diff --git a/bin/varnishd/mgt/mgt_cli.c b/bin/varnishd/mgt/mgt_cli.c
index 720bfea..e9c214a 100644
--- a/bin/varnishd/mgt/mgt_cli.c
+++ b/bin/varnishd/mgt/mgt_cli.c
@@ -393,9 +393,8 @@ mgt_cli_callback2(const struct vev *e, int what)
 {
 	int i;
 
-	(void)e;
 	(void)what;
-	i = VCLS_PollFd(mgt_cls, e->fd, 0);
+	i = VCLS_Poll(mgt_cls, e->priv, 0);
 	return (i);
 }
 
diff --git a/include/vcli_serve.h b/include/vcli_serve.h
index a1e6bb3..941551d 100644
--- a/include/vcli_serve.h
+++ b/include/vcli_serve.h
@@ -97,7 +97,7 @@ void VCLS_SetHooks(struct VCLS *, cls_cbc_f *, cls_cbc_f *);
 struct cli *VCLS_AddFd(struct VCLS *cs, int fdi, int fdo, cls_cb_f *closefunc,
     void *priv);
 void VCLS_AddFunc(struct VCLS *cs, unsigned auth, struct cli_proto *clp);
-int VCLS_PollFd(struct VCLS *cs, int fd, int timeout);
+int VCLS_Poll(struct VCLS *cs, const struct cli*, int timeout);
 void VCLS_Destroy(struct VCLS **);
 
 /* From libvarnish/cli.c */
diff --git a/lib/libvarnish/vcli_serve.c b/lib/libvarnish/vcli_serve.c
index 626ec3a..ea6ea8d 100644
--- a/lib/libvarnish/vcli_serve.c
+++ b/lib/libvarnish/vcli_serve.c
@@ -506,7 +506,7 @@ VCLS_AddFunc(struct VCLS *cs, unsigned auth, struct cli_proto *clp)
 }
 
 int
-VCLS_PollFd(struct VCLS *cs, int fd, int timeout)
+VCLS_Poll(struct VCLS *cs, const struct cli *cli, int timeout)
 {
 	struct VCLS_fd *cfd;
 	struct pollfd pfd[1];
@@ -521,7 +521,7 @@ VCLS_PollFd(struct VCLS *cs, int fd, int timeout)
 
 	i = 0;
 	VTAILQ_FOREACH(cfd, &cs->fds, list) {
-		if (cfd->fdi != fd)
+		if (cfd->cli != cli)
 			continue;
 		pfd[i].fd = cfd->fdi;
 		pfd[i].events = POLLIN;

From geoff at uplex.de  Mon Nov  6 11:47:05 2017
From: geoff at uplex.de (Geoff Simmons)
Date: Mon,  6 Nov 2017 11:47:05 +0000 (UTC)
Subject: [master] e93fb6d Docs: clarify that a -I cli_file must end with a
 terminating NL or CR.
Message-ID: <20171106114705.A728D617BC@lists.varnish-cache.org>


commit e93fb6d2a7e1e8e7574b45f6c1f54708ba28fc8a
Author: Geoff Simmons <geoff at uplex.de>
Date:   Mon Nov 6 12:45:14 2017 +0100

    Docs: clarify that a -I cli_file must end with a terminating NL or CR.

diff --git a/doc/sphinx/reference/varnishd.rst b/doc/sphinx/reference/varnishd.rst
index 90ab324..6c97236 100644
--- a/doc/sphinx/reference/varnishd.rst
+++ b/doc/sphinx/reference/varnishd.rst
@@ -393,6 +393,9 @@ startup::
   vcl.load main /etc/varnish_main.vcl
   vcl.use main
 
+Every line in the file, including the last line, must be terminated by
+a newline or carriage return.
+
 If a command in the file is prefixed with '-', failure will not abort
 the startup.
 

From nils.goroll at uplex.de  Mon Nov  6 11:54:05 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Mon,  6 Nov 2017 11:54:05 +0000 (UTC)
Subject: [master] 339833c vtc: disable coredump where we trigger a panic
Message-ID: <20171106115405.E34EE61C15@lists.varnish-cache.org>


commit 339833cdd12e7584124d457a11ccfd552a41ae64
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Mon Nov 6 12:52:51 2017 +0100

    vtc: disable coredump where we trigger a panic

diff --git a/bin/varnishtest/tests/p00007.vtc b/bin/varnishtest/tests/p00007.vtc
index 6b9e1be..b0ce377 100644
--- a/bin/varnishtest/tests/p00007.vtc
+++ b/bin/varnishtest/tests/p00007.vtc
@@ -28,6 +28,7 @@ server s1 {
 } -start
 
 varnish v1 -arg "-sdeprecated_persistent,${tmpdir}/_.per,5m" \
+	   -arg "-p feature=+no_coredump" \
 	-vcl+backend {} -start
 
 varnish v1 -cliok "debug.fragfetch 32"

From nils.goroll at uplex.de  Mon Nov  6 11:59:06 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Mon,  6 Nov 2017 11:59:06 +0000 (UTC)
Subject: [master] c1d8dbe vtc: disable coredump where we trigger a panic
Message-ID: <20171106115906.769BF61EFF@lists.varnish-cache.org>


commit c1d8dbe19e4c60fb5e8be722fae9d0e3c749161c
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Mon Nov 6 12:58:12 2017 +0100

    vtc: disable coredump where we trigger a panic

diff --git a/bin/varnishtest/tests/c00057.vtc b/bin/varnishtest/tests/c00057.vtc
index e9791d3..fc4a571 100644
--- a/bin/varnishtest/tests/c00057.vtc
+++ b/bin/varnishtest/tests/c00057.vtc
@@ -6,6 +6,7 @@ server s1 {
 } -start
 
 varnish v1 \
+	-arg "-p feature=+no_coredump" \
 	-arg "-p vcc_allow_inline_c=true" \
 	-arg "-p thread_pool_stack=48k" \
 	-vcl+backend {

From hermunn at varnish-software.com  Mon Nov  6 12:50:07 2017
From: hermunn at varnish-software.com (Pål Hermunn Johansen)
Date: Mon,  6 Nov 2017 12:50:07 +0000 (UTC)
Subject: [4.1] 9653490 Revert DEPRECATED mark on cli_buffer
Message-ID: <20171106125007.9076261FB2@lists.varnish-cache.org>


commit 96534906297fb8440b866188996d707e6b783cb7
Author: P?l Hermunn Johansen <hermunn at varnish-software.com>
Date:   Mon Nov 6 13:43:36 2017 +0100

    Revert DEPRECATED mark on cli_buffer
    
    The commit 01fa472647fe431d09f4873f5d0cefe8b9b88919 did not in fact
    remove the effect of the cli_buffer value, but it did prevent varnish
    from crashing when setting the parameter very high. This reverts the
    change in the documentation.

diff --git a/doc/changes.rst b/doc/changes.rst
index 558be47..bfd7cff 100644
--- a/doc/changes.rst
+++ b/doc/changes.rst
@@ -8,8 +8,7 @@ Changes since 4.1.8:
 * Add the vtc feature ignore_unknown_macro.
 * Expose to VCL whether or not a fetch is a background fetch (bgfetch)
 * Ignore req.ttl when keeping track of expired objects (see 2422_)
-* Move the cli buffer to VSB (from stack). This deprecates the parameter
-  cli_buffer.
+* Move a cli buffer to VSB (from stack).
 * Use a separate stack for signals.
 
 .. _2422: https://github.com/varnishcache/varnish-cache/pull/2422
diff --git a/include/tbl/params.h b/include/tbl/params.h
index 3546b67..9a272a3 100644
--- a/include/tbl/params.h
+++ b/include/tbl/params.h
@@ -235,8 +235,10 @@ PARAM(
 	/* units */	"bytes",
 	/* flags */	0,
 	/* s-text */
-	"DEPRECATED: This parameter is ignored.\n"
-	"Memory for the CLI command buffer is now dynamically allocated.",
+	"Size of buffer for CLI command input.\n"
+	"You may need to increase this if you have big VCL files and use "
+	"the vcl.inline CLI command.\n"
+	"NB: Must be specified with -p to have effect.",
 	/* l-text */	"",
 	/* func */	NULL
 )

From nils.goroll at uplex.de  Mon Nov  6 17:05:07 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Mon,  6 Nov 2017 17:05:07 +0000 (UTC)
Subject: [master] 217d927 serialize access to heritage.socks in the child
Message-ID: <20171106170507.C5AF462667@lists.varnish-cache.org>


commit 217d9277fa4b6fc44a9d4c9b8736a937aa4029ba
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Mon Nov 6 17:51:23 2017 +0100

    serialize access to heritage.socks in the child
    
    I did consider avoiding locks, but as long as the close() in VCA_Shutdown()
    happens concurrent to vca_acct(), the file descriptor could become invalid
    at any time, so even if we'd not hit the sock > 0 assertion, other errors
    could occur / assertions be hit.
    
    We could also move the close to vca_acct() and just signal it to finish off,
    but this would delay the close by the sleep(1), unless we further complicated
    things with a condvar.
    
    Avoiding the lock would require us to make any operation on a socket fd
    ignore errors, which is totally against our policy to assert on everything.
    (see vca_tcp_opt_set() for example).
    
    So, for the time being, I think simple serialization using a pthread mutex
    is the safest and simplest solution. A varnish lock would be overkill, as
    this lock is really only relevant during VCA_Shutdown.
    
    IMHO, the primary risk involved here is delayed VCA_Shutdown() due to
    vca_acct() hanging in a syscall. Famous Last Words - sigh.
    
    Fixes #2482

diff --git a/bin/varnishd/cache/cache_acceptor.c b/bin/varnishd/cache/cache_acceptor.c
index f552b85..523bba9 100644
--- a/bin/varnishd/cache/cache_acceptor.c
+++ b/bin/varnishd/cache/cache_acceptor.c
@@ -53,6 +53,7 @@ static pthread_t	VCA_thread;
 static double vca_pace = 0.0;
 static struct lock pace_mtx;
 static unsigned pool_accepting;
+static pthread_mutex_t shut_mtx = PTHREAD_MUTEX_INITIALIZER;
 
 struct wrk_accept {
 	unsigned		magic;
@@ -529,9 +530,12 @@ vca_acct(void *arg)
 
 	(void)vca_tcp_opt_init();
 
+	AZ(pthread_mutex_lock(&shut_mtx));
 	VTAILQ_FOREACH(ls, &heritage.socks, list) {
 		CHECK_OBJ_NOTNULL(ls->transport, TRANSPORT_MAGIC);
-		assert (ls->sock > 0);		// We know where stdin is
+		if (ls->sock == -2)
+			continue;	// VCA_Shutdown
+		assert (ls->sock > 0);	// We know where stdin is
 		if (cache_param->tcp_fastopen) {
 			int i;
 			i = VTCP_fastopen(ls->sock, cache_param->listen_depth);
@@ -551,6 +555,7 @@ vca_acct(void *arg)
 				    ls->sock, i, strerror(errno));
 		}
 	}
+	AZ(pthread_mutex_unlock(&shut_mtx));
 
 	need_test = 1;
 	pool_accepting = 1;
@@ -559,12 +564,14 @@ vca_acct(void *arg)
 	while (1) {
 		(void)sleep(1);
 		if (vca_tcp_opt_init()) {
+			AZ(pthread_mutex_lock(&shut_mtx));
 			VTAILQ_FOREACH(ls, &heritage.socks, list) {
 				if (ls->sock == -2)
-					continue;	// raced VCA_Shutdown
+					continue;	// VCA_Shutdown
 				assert (ls->sock > 0);
 				vca_tcp_opt_set(ls->sock, 1);
 			}
+			AZ(pthread_mutex_unlock(&shut_mtx));
 		}
 		now = VTIM_real();
 		VSC_C_main->uptime = (uint64_t)(now - t0);
@@ -606,10 +613,12 @@ ccf_listen_address(struct cli *cli, const char * const *av, void *priv)
 	while (!pool_accepting)
 		VTIM_sleep(.1);
 
+	AZ(pthread_mutex_lock(&shut_mtx));
 	VTAILQ_FOREACH(ls, &heritage.socks, list) {
 		VTCP_myname(ls->sock, h, sizeof h, p, sizeof p);
 		VCLI_Out(cli, "%s %s\n", h, p);
 	}
+	AZ(pthread_mutex_unlock(&shut_mtx));
 }
 
 /*--------------------------------------------------------------------*/
@@ -634,11 +643,13 @@ VCA_Shutdown(void)
 	struct listen_sock *ls;
 	int i;
 
+	AZ(pthread_mutex_lock(&shut_mtx));
 	VTAILQ_FOREACH(ls, &heritage.socks, list) {
 		i = ls->sock;
 		ls->sock = -2;
 		(void)close(i);
 	}
+	AZ(pthread_mutex_unlock(&shut_mtx));
 }
 
 /*--------------------------------------------------------------------

From nils.goroll at uplex.de  Mon Nov  6 18:24:05 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Mon,  6 Nov 2017 18:24:05 +0000 (UTC)
Subject: [master] 0e5bd29 remove a now obsolete comment
Message-ID: <20171106182405.B7E5E6108F@lists.varnish-cache.org>


commit 0e5bd297d3e0f82c1cdb381d7984a8ff893cae96
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Mon Nov 6 19:13:08 2017 +0100

    remove a now obsolete comment
    
    Somehow this comment has survived even though we don't use BUILT_SOURCES
    here any more

diff --git a/lib/libvcc/vmodtool.py b/lib/libvcc/vmodtool.py
index 1b5aaad..bed65e4 100755
--- a/lib/libvcc/vmodtool.py
+++ b/lib/libvcc/vmodtool.py
@@ -72,8 +72,6 @@ libvmod_XXX_la_LDFLAGS = \\
 
 nodist_libvmod_XXX_la_SOURCES = vcc_if.c vcc_if.h
 
-# BUILT_SOURCES is only a hack
-# and dependency tracking does not help for the first build
 $(libvmod_XXX_la_OBJECTS): vcc_if.h
 
 vcc_if.h vmod_XXX.rst vmod_XXX.man.rst: vcc_if.c
diff --git a/lib/libvmod_debug/Makefile.am b/lib/libvmod_debug/Makefile.am
index dddd350..0bc92d3 100644
--- a/lib/libvmod_debug/Makefile.am
+++ b/lib/libvmod_debug/Makefile.am
@@ -35,7 +35,6 @@ nodist_libvmod_debug_la_SOURCES = \
 	vcc_if.c \
 	vcc_if.h
 
-# BUILT_SOURCES is only a hack and dependency tracking does not help for the first build
 $(libvmod_debug_la_OBJECTS): vcc_if.h
 
 vcc_if.h vmod_debug.rst vmod_debug.man.rst: vcc_if.c

From nils.goroll at uplex.de  Mon Nov  6 18:24:05 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Mon,  6 Nov 2017 18:24:05 +0000 (UTC)
Subject: [master] 8a84960 update generated boilerplates
Message-ID: <20171106182405.D468D61094@lists.varnish-cache.org>


commit 8a84960f608f993f1ee49d3c576a4c86d4f34990
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Mon Nov 6 19:15:07 2017 +0100

    update generated boilerplates

diff --git a/lib/libvmod_blob/automake_boilerplate.am b/lib/libvmod_blob/automake_boilerplate.am
index 3b4ed7a..e934696 100644
--- a/lib/libvmod_blob/automake_boilerplate.am
+++ b/lib/libvmod_blob/automake_boilerplate.am
@@ -24,8 +24,6 @@ libvmod_blob_la_LDFLAGS = \
 
 nodist_libvmod_blob_la_SOURCES = vcc_if.c vcc_if.h
 
-# BUILT_SOURCES is only a hack
-# and dependency tracking does not help for the first build
 $(libvmod_blob_la_OBJECTS): vcc_if.h
 
 vcc_if.h vmod_blob.rst vmod_blob.man.rst: vcc_if.c
diff --git a/lib/libvmod_directors/automake_boilerplate.am b/lib/libvmod_directors/automake_boilerplate.am
index 19e10a3..df54f45 100644
--- a/lib/libvmod_directors/automake_boilerplate.am
+++ b/lib/libvmod_directors/automake_boilerplate.am
@@ -24,8 +24,6 @@ libvmod_directors_la_LDFLAGS = \
 
 nodist_libvmod_directors_la_SOURCES = vcc_if.c vcc_if.h
 
-# BUILT_SOURCES is only a hack
-# and dependency tracking does not help for the first build
 $(libvmod_directors_la_OBJECTS): vcc_if.h
 
 vcc_if.h vmod_directors.rst vmod_directors.man.rst: vcc_if.c
diff --git a/lib/libvmod_purge/automake_boilerplate.am b/lib/libvmod_purge/automake_boilerplate.am
index 3a5b4a5..b400cdb 100644
--- a/lib/libvmod_purge/automake_boilerplate.am
+++ b/lib/libvmod_purge/automake_boilerplate.am
@@ -24,8 +24,6 @@ libvmod_purge_la_LDFLAGS = \
 
 nodist_libvmod_purge_la_SOURCES = vcc_if.c vcc_if.h
 
-# BUILT_SOURCES is only a hack
-# and dependency tracking does not help for the first build
 $(libvmod_purge_la_OBJECTS): vcc_if.h
 
 vcc_if.h vmod_purge.rst vmod_purge.man.rst: vcc_if.c
diff --git a/lib/libvmod_std/automake_boilerplate.am b/lib/libvmod_std/automake_boilerplate.am
index 66410b0..c1d6e3d 100644
--- a/lib/libvmod_std/automake_boilerplate.am
+++ b/lib/libvmod_std/automake_boilerplate.am
@@ -24,8 +24,6 @@ libvmod_std_la_LDFLAGS = \
 
 nodist_libvmod_std_la_SOURCES = vcc_if.c vcc_if.h
 
-# BUILT_SOURCES is only a hack
-# and dependency tracking does not help for the first build
 $(libvmod_std_la_OBJECTS): vcc_if.h
 
 vcc_if.h vmod_std.rst vmod_std.man.rst: vcc_if.c
diff --git a/lib/libvmod_vtc/automake_boilerplate.am b/lib/libvmod_vtc/automake_boilerplate.am
index 1eb8f6f..d7bd77e 100644
--- a/lib/libvmod_vtc/automake_boilerplate.am
+++ b/lib/libvmod_vtc/automake_boilerplate.am
@@ -24,8 +24,6 @@ libvmod_vtc_la_LDFLAGS = \
 
 nodist_libvmod_vtc_la_SOURCES = vcc_if.c vcc_if.h
 
-# BUILT_SOURCES is only a hack
-# and dependency tracking does not help for the first build
 $(libvmod_vtc_la_OBJECTS): vcc_if.h
 
 vcc_if.h vmod_vtc.rst vmod_vtc.man.rst: vcc_if.c

From nils.goroll at uplex.de  Mon Nov  6 19:24:08 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Mon,  6 Nov 2017 19:24:08 +0000 (UTC)
Subject: [master] 0d58783 Add a vsc to vmod_debug for testing / troubleshooting
Message-ID: <20171106192408.15E7C615EF@lists.varnish-cache.org>


commit 0d587836fa415409c561b8737fb1aada6aa276c4
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Mon Nov 6 20:02:14 2017 +0100

    Add a vsc to vmod_debug for testing / troubleshooting
    
    vmod_vtc might be a better place for it, but we should probably get $VSC
    support in vmodtool first and generate the am_boilerplate for it.
    
    Ref #2470

diff --git a/lib/libvmod_debug/Makefile.am b/lib/libvmod_debug/Makefile.am
index 0bc92d3..edb074c 100644
--- a/lib/libvmod_debug/Makefile.am
+++ b/lib/libvmod_debug/Makefile.am
@@ -42,8 +42,21 @@ vcc_if.h vmod_debug.rst vmod_debug.man.rst: vcc_if.c
 vcc_if.c: $(vmodtool) $(vmod_srcdir)/vmod.vcc
 	@PYTHON@ $(vmodtool) $(vmodtoolargs) $(vmod_srcdir)/vmod.vcc
 
+.vsc.c:
+	$(PYTHON) $(top_srcdir)/lib/libvcc/vsctool.py -ch $<
+
+VSC_SRC		= VSC_debug.vsc
+VSC_GEN_C	= VSC_debug.c
+VSC_GEN_H	= VSC_debug.h
+
+BUILT_SOURCES			 = $(VSC_GEN_C)
+libvmod_debug_la_SOURCES	+= $(VSC_SRC)
+
+$(VSC_GEN_C): $(top_srcdir)/lib/libvcc/vsctool.py
+
 EXTRA_DIST = vmod.vcc
 
 CLEANFILES = $(builddir)/vcc_if.c $(builddir)/vcc_if.h \
 	$(builddir)/vmod_debug.rst \
-	$(builddir)/vmod_debug.man.rst
+	$(builddir)/vmod_debug.man.rst \
+	$(VSC_GEN_C) $(VSC_GEN_H)
diff --git a/lib/libvmod_debug/VSC_debug.vsc b/lib/libvmod_debug/VSC_debug.vsc
new file mode 100644
index 0000000..aac6410
--- /dev/null
+++ b/lib/libvmod_debug/VSC_debug.vsc
@@ -0,0 +1,15 @@
+#
+.. varnish_vsc_begin::	debug
+	:oneliner:	Example Counters
+	:order:		70
+
+	Test counters from vmod_debug
+
+.. varnish_vsc:: foo
+	:type:		counter
+	:level:		debug
+	:oneliner:	arbitrary counter
+
+	Just counting something
+
+.. varnish_vsc_end::	debug
diff --git a/lib/libvmod_debug/vmod.vcc b/lib/libvmod_debug/vmod.vcc
index b33e0d9..bb12df3 100644
--- a/lib/libvmod_debug/vmod.vcc
+++ b/lib/libvmod_debug/vmod.vcc
@@ -213,3 +213,11 @@ Returns the size in bytes of a collection of C-datatypes.
 * 'z' = size_t
 * 'o' = off_t
 * 'j' = intmax_t
+
+$Function VOID vsc_new()
+
+Add a vsc
+
+$Function VOID vsc_destroy()
+
+Remove a vsc
diff --git a/lib/libvmod_debug/vmod_debug.c b/lib/libvmod_debug/vmod_debug.c
index 74718e7..ad6b6a5 100644
--- a/lib/libvmod_debug/vmod_debug.c
+++ b/lib/libvmod_debug/vmod_debug.c
@@ -42,6 +42,7 @@
 #include "vtcp.h"
 #include "vtim.h"
 #include "vcc_if.h"
+#include "VSC_debug.h"
 
 #include "common/common_param.h"
 
@@ -64,6 +65,9 @@ struct priv_vcl {
 
 static VCL_DURATION vcl_release_delay = 0.0;
 
+pthread_mutex_t vsc_mtx = PTHREAD_MUTEX_INITIALIZER;
+static struct VSC_debug *vsc;
+
 VCL_VOID __match_proto__(td_debug_panic)
 xyzzy_panic(VRT_CTX, const char *str, ...)
 {
@@ -351,6 +355,10 @@ event_function(VRT_CTX, struct vmod_priv *priv, enum vcl_event_e e)
 	case VCL_EVENT_LOAD: return (event_load(ctx, priv));
 	case VCL_EVENT_WARM: return (event_warm(ctx, priv));
 	case VCL_EVENT_COLD: return (event_cold(ctx, priv));
+	case VCL_EVENT_DISCARD:
+		if (vsc)
+			VSC_debug_Destroy(&vsc);
+		return (0);
 	default: return (0);
 	}
 }
@@ -565,3 +573,25 @@ xyzzy_typesize(VRT_CTX, VCL_STRING s)
 	}
 	return ((VCL_INT)i);
 }
+
+VCL_VOID
+xyzzy_vsc_new(VRT_CTX)
+{
+	(void)ctx;
+	AZ(pthread_mutex_lock(&vsc_mtx));
+	if (vsc == NULL)
+		vsc = VSC_debug_New("");
+	AN(vsc);
+	AZ(pthread_mutex_unlock(&vsc_mtx));
+}
+
+VCL_VOID
+xyzzy_vsc_destroy(VRT_CTX)
+{
+	(void)ctx;
+	AZ(pthread_mutex_lock(&vsc_mtx));
+	if (vsc)
+		VSC_debug_Destroy(&vsc);
+	AZ(vsc);
+	AZ(pthread_mutex_unlock(&vsc_mtx));
+}

From nils.goroll at uplex.de  Mon Nov  6 21:14:09 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Mon,  6 Nov 2017 21:14:09 +0000 (UTC)
Subject: [master] ab2126a I guess we can affort that much verbosity to help
 future troubleshooters
Message-ID: <20171106211409.2A596618E1@lists.varnish-cache.org>


commit ab2126af9f774922c37882dc08cce05890134fd7
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Mon Nov 6 21:55:09 2017 +0100

    I guess we can affort that much verbosity to help future troubleshooters

diff --git a/lib/libvarnishapi/vut.c b/lib/libvarnishapi/vut.c
index 46b2aa1..2c2f54d 100644
--- a/lib/libvarnishapi/vut.c
+++ b/lib/libvarnishapi/vut.c
@@ -367,7 +367,7 @@ VUT_Main(struct VUT *vut)
 		if (vut->vsm != NULL &&
 		    (VSM_Status(vut->vsm) & VSM_WRK_RESTARTED)) {
 			if (hascursor < 1) {
-				fprintf(stderr, "Log abandonned\n");
+				fprintf(stderr, "Log abandonned (vsm)\n");
 				VSLQ_SetCursor(vut->vslq, NULL);
 				hascursor = 0;
 			}
@@ -417,7 +417,7 @@ VUT_Main(struct VUT *vut)
 
 		if (i == -2) {
 			/* Abandoned */
-			fprintf(stderr, "Log abandoned\n");
+			fprintf(stderr, "Log abandoned (vsl)\n");
 			VSLQ_SetCursor(vut->vslq, NULL);
 			hascursor = 0;
 		} else if (i < -2)

From nils.goroll at uplex.de  Mon Nov  6 21:14:09 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Mon,  6 Nov 2017 21:14:09 +0000 (UTC)
Subject: [master] cbdfa1a Only update VSM segments which actually _have_
 changed
Message-ID: <20171106211409.45E83618E3@lists.varnish-cache.org>


commit cbdfa1aaddfa05e0db290c93436ec2a204f07d3b
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Mon Nov 6 21:56:27 2017 +0100

    Only update VSM segments which actually _have_ changed
    
    a vav[0] is the error or NULL if ok. vsm_cmp_av considers NULL the end
    of the av, so we would always comare vg and the av equal and begin insertion
    of new vgs. This would lead to all vsm segments be removed and newly added.
    
    Fixes #2470

diff --git a/lib/libvarnishapi/vsm.c b/lib/libvarnishapi/vsm.c
index 2b8c7e6..d623538 100644
--- a/lib/libvarnishapi/vsm.c
+++ b/lib/libvarnishapi/vsm.c
@@ -447,6 +447,10 @@ vsm_refresh_set2(struct vsm *vd, struct vsm_set *vs, struct vsb *vsb)
 	VTAILQ_FOREACH(vg, &vs->segs, list)
 		vg->markscan = 0;
 
+	/*
+	 * Efficient comparison walking the two lists side-by-side is ok because
+	 * segment inserts always happen at the tail (VSMW_Allocv)
+	 */
 	vg = VTAILQ_FIRST(&vs->segs);
 	while (p != NULL && *p != '\0') {
 		e = strchr(p, '\n');
@@ -463,7 +467,7 @@ vsm_refresh_set2(struct vsm *vd, struct vsm_set *vs, struct vsb *vsb)
 			VAV_Free(av);
 			break;
 		}
-		while (vg != NULL && !vsm_cmp_av(vg->av, av))
+		while (vg != NULL && !vsm_cmp_av(&vg->av[1], &av[1]))
 			vg = VTAILQ_NEXT(vg, list);
 
 		if (vg != NULL) {

From nils.goroll at uplex.de  Tue Nov  7 00:27:04 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Tue,  7 Nov 2017 00:27:04 +0000 (UTC)
Subject: [master] 6a5e89c Fix the VSM segment update for real (I hope)
Message-ID: <20171107002704.4FA3761A7F@lists.varnish-cache.org>


commit 6a5e89cb11f8aeea8be70f71d652163ca6589faa
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Mon Nov 6 23:20:25 2017 +0100

    Fix the VSM segment update for real (I hope)
    
    Somehow I was unable to see that the code did not actually do what I
    thought (and documented) it would do.
    
    Fixes #2470

diff --git a/lib/libvarnishapi/vsm.c b/lib/libvarnishapi/vsm.c
index d623538..53fb98b 100644
--- a/lib/libvarnishapi/vsm.c
+++ b/lib/libvarnishapi/vsm.c
@@ -449,9 +449,17 @@ vsm_refresh_set2(struct vsm *vd, struct vsm_set *vs, struct vsb *vsb)
 
 	/*
 	 * Efficient comparison walking the two lists side-by-side is ok because
-	 * segment inserts always happen at the tail (VSMW_Allocv)
+	 * segment inserts always happen at the tail (VSMW_Allocv()). So, as
+	 * soon as vg is exhausted, we only insert.
+	 *
+	 * For restarts, we require a tabula rasa
 	 */
-	vg = VTAILQ_FIRST(&vs->segs);
+
+	if (retval & VSM_MGT_RESTARTED)
+		vg = NULL;
+	else
+		vg = VTAILQ_FIRST(&vs->segs);
+
 	while (p != NULL && *p != '\0') {
 		e = strchr(p, '\n');
 		if (e == NULL)
@@ -467,14 +475,8 @@ vsm_refresh_set2(struct vsm *vd, struct vsm_set *vs, struct vsb *vsb)
 			VAV_Free(av);
 			break;
 		}
-		while (vg != NULL && !vsm_cmp_av(&vg->av[1], &av[1]))
-			vg = VTAILQ_NEXT(vg, list);
 
-		if (vg != NULL) {
-			VAV_Free(av);
-			vg->markscan = 1;
-			vg = VTAILQ_NEXT(vg, list);
-		} else {
+		if (vg == NULL) {
 			ALLOC_OBJ(vg2, VSM_SEG_MAGIC);
 			AN(vg2);
 			vg2->av = av;
@@ -482,9 +484,21 @@ vsm_refresh_set2(struct vsm *vd, struct vsm_set *vs, struct vsb *vsb)
 			vg2->markscan = 1;
 			vg2->serial = ++vd->serial;
 			VTAILQ_INSERT_TAIL(&vs->segs, vg2, list);
+			continue;
+		}
+
+		while (vg != NULL && vsm_cmp_av(&vg->av[1], &av[1])) {
+			vg = VTAILQ_NEXT(vg, list);
 		}
 
+		VAV_Free(av);
+
+		if (vg == NULL)
+			continue;
 
+		/* entry compared equal, so it survives */
+		vg->markscan = 1;
+		vg = VTAILQ_NEXT(vg, list);
 	}
 	return (retval);
 }

From nils.goroll at uplex.de  Tue Nov  7 10:44:06 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Tue,  7 Nov 2017 10:44:06 +0000 (UTC)
Subject: [master] db1b11f rip out a long obsolete comment
Message-ID: <20171107104406.29D1362541@lists.varnish-cache.org>


commit db1b11fde12c47eec227af76c7ea751947bfbf17
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Tue Nov 7 11:00:48 2017 +0100

    rip out a long obsolete comment
    
    This should have gone with d9a9ecd999f78123ac6ef5dfa8fd4aac38130c26

diff --git a/bin/varnishd/cache/cache_esi_deliver.c b/bin/varnishd/cache/cache_esi_deliver.c
index 9770315..0d3e451 100644
--- a/bin/varnishd/cache/cache_esi_deliver.c
+++ b/bin/varnishd/cache/cache_esi_deliver.c
@@ -165,11 +165,6 @@ ved_include(struct req *preq, const char *src, const char *host,
 	req->vcl = preq->vcl;
 	preq->vcl = NULL;
 
-	/*
-	 * XXX: We should decide if we should cache the director
-	 * XXX: or not (for session/backend coupling).  Until then
-	 * XXX: make sure we don't trip up the check in vcl_recv.
-	 */
 	req->req_step = R_STP_RECV;
 	req->t_req = preq->t_req;
 	assert(isnan(req->t_first));

From nils.goroll at uplex.de  Tue Nov  7 11:21:06 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Tue,  7 Nov 2017 11:21:06 +0000 (UTC)
Subject: [master] bf6d14d Improve snapshot/reset test
Message-ID: <20171107112106.1A3196211E@lists.varnish-cache.org>


commit bf6d14d99db749a94831460b2f1736292981b8ef
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Tue Nov 7 11:52:52 2017 +0100

    Improve snapshot/reset test

diff --git a/bin/varnishtest/tests/c00074.vtc b/bin/varnishtest/tests/c00074.vtc
index 1642e97..abf886a 100644
--- a/bin/varnishtest/tests/c00074.vtc
+++ b/bin/varnishtest/tests/c00074.vtc
@@ -10,16 +10,25 @@ varnish v1 -vcl+backend {
 	import vtc;
 
 	sub vcl_recv {
-		set req.http.ws-free = vtc.workspace_free(session);
-		vtc.workspace_alloc(session, std.integer(req.http.ws-free, 0));
+		set req.http.ws-free1 = vtc.workspace_free(session);
+		vtc.workspace_alloc(session, std.integer(req.http.ws-free1, 0));
+		set req.http.ws-free2 = vtc.workspace_free(session);
 		vtc.workspace_snapshot(session);
 		vtc.workspace_reset(session);
+		set req.http.ws-free3 = vtc.workspace_free(session);
 	}
 } -start
 
+logexpect l1 -v v1 -g request {
+	expect * * ReqHeader {^ws-free1:}
+	expect 0 = ReqHeader {^ws-free2: 0$}
+	expect 0 = ReqHeader {^ws-free3: 0$}
+} -start
+
 client c1 {
 	txreq -url /foo
 	rxresp
 	expect resp.status == 200
 } -run
 
+logexpect l1 -wait

From nils.goroll at uplex.de  Tue Nov  7 11:29:05 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Tue,  7 Nov 2017 11:29:05 +0000 (UTC)
Subject: [master] c9b32e1 lift artificial limits on read access to request
 attributes
Message-ID: <20171107112905.C81466250E@lists.varnish-cache.org>


commit c9b32e15248213ab2d17a3d558acfd12c118dc66
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Mon Oct 2 16:03:41 2017 +0200

    lift artificial limits on read access to request attributes
    
    I see absolutely no reason why we shouldn't allow read access outside
    vcl_recv
    
    Merges #2447

diff --git a/lib/libvcc/generate.py b/lib/libvcc/generate.py
index 2ff3857..bfd4251 100755
--- a/lib/libvcc/generate.py
+++ b/lib/libvcc/generate.py
@@ -270,7 +270,7 @@ sp_variables = [
 	),
 	('req.storage',
 		'STEVEDORE',
-		('recv',),
+		('client',),
 		('recv',), """
 		The storage backend to use to save this request body.
 		"""
@@ -336,7 +336,7 @@ sp_variables = [
 	),
 	('req.hash_ignore_busy',
 		'BOOL',
-		('recv',),
+		('client',),
 		('recv',), """
 		Ignore any busy object during cache lookup. You
 		would want to do this if you have two server looking
@@ -345,7 +345,7 @@ sp_variables = [
 	),
 	('req.hash_always_miss',
 		'BOOL',
-		('recv',),
+		('client',),
 		('recv',), """
 		Force a cache miss for this request. If set to true
 		Varnish will disregard any existing objects and

From nils.goroll at uplex.de  Tue Nov  7 11:29:05 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Tue,  7 Nov 2017 11:29:05 +0000 (UTC)
Subject: [master] c2406f4 For restarts,
 keep all req attributes except req.restarts and req.xid
Message-ID: <20171107112905.EFDF862511@lists.varnish-cache.org>


commit c2406f4ff586b7f00efb86d06a250ec249f6f53d
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Mon Oct 2 14:06:08 2017 +0200

    For restarts, keep all req attributes except req.restarts and req.xid
    
    Fixes #2405 for restarts
    Merges #2447
    
    remaining TODOs (but not the scope of this ticket):
    
    * Keep bereq attributes for bereq
    * improved rollback

diff --git a/bin/varnishd/cache/cache_req_fsm.c b/bin/varnishd/cache/cache_req_fsm.c
index f0f56cc..e97ce19 100644
--- a/bin/varnishd/cache/cache_req_fsm.c
+++ b/bin/varnishd/cache/cache_req_fsm.c
@@ -722,7 +722,6 @@ cnt_restart(struct worker *wrk, struct req *req)
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
 	CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
 
-	req->director_hint = NULL;
 	if (++req->restarts > cache_param->max_restarts) {
 		VSLb(req->vsl, SLT_VCL_Error, "Too many restarts");
 		req->err_code = 503;
@@ -736,7 +735,6 @@ cnt_restart(struct worker *wrk, struct req *req)
 		req->err_code = 0;
 		req->req_step = R_STP_RECV;
 	}
-	req->is_hit = 0;
 	return (REQ_FSM_MORE);
 }
 
@@ -783,22 +781,23 @@ cnt_recv(struct worker *wrk, struct req *req)
 		} else {
 			http_PrintfHeader(req->http, "X-Forwarded-For: %s", ci);
 		}
-	}
+		http_CollectHdr(req->http, H_Cache_Control);
 
-	/* By default we use the first backend */
-	AZ(req->director_hint);
-	req->director_hint = VCL_DefaultDirector(req->vcl);
-	AN(req->director_hint);
+		/* By default we use the first backend */
+		AZ(req->director_hint);
+		req->director_hint = VCL_DefaultDirector(req->vcl);
+		AN(req->director_hint);
+
+		req->d_ttl = -1;
+		req->disable_esi = 0;
+		req->hash_always_miss = 0;
+		req->hash_ignore_busy = 0;
+		req->client_identity = NULL;
+		req->storage = NULL;
+	}
 
 	req->vdc->retval = 0;
-	req->d_ttl = -1;
-	req->disable_esi = 0;
-	req->hash_always_miss = 0;
-	req->hash_ignore_busy = 0;
-	req->client_identity = NULL;
-	req->storage = NULL;
-
-	http_CollectHdr(req->http, H_Cache_Control);
+	req->is_hit = 0;
 
 	if (req->req_body_status == REQ_BODY_FAIL) {
 		req->doclose = SC_OVERLOAD;
diff --git a/bin/varnishtest/tests/c00009.vtc b/bin/varnishtest/tests/c00009.vtc
index 7931e81..6ff3d97 100644
--- a/bin/varnishtest/tests/c00009.vtc
+++ b/bin/varnishtest/tests/c00009.vtc
@@ -12,8 +12,20 @@ server s2 {
 	txresp -body "foobar"
 } -start
 
-varnish v1 -vcl+backend {
+varnish v1 -arg "-smysteve=malloc,1m" -vcl+backend {
 	sub vcl_recv {
+		if (req.restarts == 0) {
+			set req.url = "/foo";
+			set req.method = "POST";
+			set req.proto = "HTTP/1.2";
+			set req.http.preserveme = "1";
+			set req.storage = storage.mysteve;
+			set req.ttl = 42m;
+			set req.esi = false;
+			set req.backend_hint = s2;
+			set req.hash_ignore_busy = true;
+			set req.hash_always_miss = true;
+		}
 		set req.http.restarts = req.restarts;
 	}
 	sub vcl_backend_fetch {
@@ -35,14 +47,36 @@ varnish v1 -vcl+backend {
 		if (resp.status != 200) {
 			return (restart);
 		}
+		set resp.http.method = req.method;
+		set resp.http.url = req.url;
+		set resp.http.proto = req.proto;
+		set resp.http.preserveme = req.http.preserveme;
+		set resp.http.restarts = req.restarts;
+		set resp.http.storage = req.storage;
+		set resp.http.ttl = req.ttl;
+		set resp.http.esi = req.esi;
+		set resp.http.backend_hint = req.backend_hint;
+		set resp.http.hash-ignore-busy = req.hash_ignore_busy;
+		set resp.http.hash-always-miss = req.hash_always_miss;
 	}
 } -start
 
 client c1 {
-	txreq -url "/foo"
+	txreq -url "/"
 	rxresp
 	expect resp.status == 200
 	expect resp.bodylen == 6
+	expect resp.http.method == POST
+	expect resp.http.url == /foo
+	expect resp.http.proto == HTTP/1.2
+	expect resp.http.preserveme == 1
+	expect resp.http.restarts == 1
+	expect resp.http.storage == storage.mysteve
+	expect resp.http.ttl == 2520.000
+	expect resp.http.esi == false
+	expect resp.http.backend_hint == s2
+	expect resp.http.hash-ignore-busy == true
+	expect resp.http.hash-always-miss == true
 }
 
 client c1 -run
diff --git a/doc/changes.rst b/doc/changes.rst
index 971d269..f96778a 100644
--- a/doc/changes.rst
+++ b/doc/changes.rst
@@ -6,6 +6,10 @@ Varnish Cache Trunk (ongoing)
   less than the number of allowed restarts, it now is the number of
   ``return(restart)`` calls per request.
 
+* Fix behaviour of restarts to how it was originally intended:
+  Restarts now leave all the request properties in place except for
+  ``req.restarts`` and ``req.xid``, which need to change by design.
+
 ================================
 Varnish Cache 5.2.0 (2017-09-15)
 ================================
diff --git a/doc/sphinx/users-guide/vcl-built-in-subs.rst b/doc/sphinx/users-guide/vcl-built-in-subs.rst
index 14a740d..68c28ae 100644
--- a/doc/sphinx/users-guide/vcl-built-in-subs.rst
+++ b/doc/sphinx/users-guide/vcl-built-in-subs.rst
@@ -59,6 +59,10 @@ common return keywords
     parameter, control is passed to :ref:`vcl_synth` as for
     ``return(synth(503, "Too many restarts"))``
 
+    For a restart, all modifications to ``req`` attributes are
+    preserved except for ``req.restarts`` and ``req.xid``, which need
+    to change by design.
+
 -----------
 client side
 -----------
diff --git a/lib/libvcc/generate.py b/lib/libvcc/generate.py
index bfd4251..a5d0bd1 100755
--- a/lib/libvcc/generate.py
+++ b/lib/libvcc/generate.py
@@ -330,8 +330,6 @@ sp_variables = [
 		or the director otherwise.
 		When used in string context, returns the name of the director
 		or backend, respectively.
-		Note: backend_hint gets reset to the default backend by
-		restarts!
 		"""
 	),
 	('req.hash_ignore_busy',

From nils.goroll at uplex.de  Tue Nov  7 11:29:06 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Tue,  7 Nov 2017 11:29:06 +0000 (UTC)
Subject: [master] 3da2ed6 ensure consistent req init for vcl switching
Message-ID: <20171107112906.22F126251B@lists.varnish-cache.org>


commit 3da2ed68340ae85bf774352bff93e73926d854dc
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Mon Oct 2 16:40:56 2017 +0200

    ensure consistent req init for vcl switching
    
    Merges #2447

diff --git a/bin/varnishd/cache/cache_req_fsm.c b/bin/varnishd/cache/cache_req_fsm.c
index e97ce19..cbf3576 100644
--- a/bin/varnishd/cache/cache_req_fsm.c
+++ b/bin/varnishd/cache/cache_req_fsm.c
@@ -738,35 +738,15 @@ cnt_restart(struct worker *wrk, struct req *req)
 	return (REQ_FSM_MORE);
 }
 
-/*--------------------------------------------------------------------
- * We have a complete request, set everything up and start it.
- * We can come here both with a request from the client and with
- * a interior request during ESI delivery.
+/*
+ * prepare the request for vcl_recv, either initially or after a reset
+ * e.g. due to vcl switching
  */
 
-static enum req_fsm_nxt
-cnt_recv(struct worker *wrk, struct req *req)
+static void
+cnt_recv_prep(struct req *req, const char *ci)
 {
-	unsigned recv_handling;
-	struct VSHA256Context sha256ctx;
 	const char *xff;
-	const char *ci, *cp;
-
-	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
-	CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
-	AN(req->vcl);
-	AZ(req->objcore);
-	AZ(req->err_code);
-
-	AZ(isnan(req->t_first));
-	AZ(isnan(req->t_prev));
-	AZ(isnan(req->t_req));
-
-	ci = SES_Get_String_Attr(req->sp, SA_CLIENT_IP);
-	cp = SES_Get_String_Attr(req->sp, SA_CLIENT_PORT);
-	VSLb(req->vsl, SLT_ReqStart, "%s %s", ci, cp);
-
-	http_VSL_log(req->http);
 
 	if (req->restarts == 0) {
 		/*
@@ -784,7 +764,6 @@ cnt_recv(struct worker *wrk, struct req *req)
 		http_CollectHdr(req->http, H_Cache_Control);
 
 		/* By default we use the first backend */
-		AZ(req->director_hint);
 		req->director_hint = VCL_DefaultDirector(req->vcl);
 		AN(req->director_hint);
 
@@ -798,6 +777,37 @@ cnt_recv(struct worker *wrk, struct req *req)
 
 	req->vdc->retval = 0;
 	req->is_hit = 0;
+}
+/*--------------------------------------------------------------------
+ * We have a complete request, set everything up and start it.
+ * We can come here both with a request from the client and with
+ * a interior request during ESI delivery.
+ */
+
+static enum req_fsm_nxt
+cnt_recv(struct worker *wrk, struct req *req)
+{
+	unsigned recv_handling;
+	struct VSHA256Context sha256ctx;
+	const char *ci, *cp;
+
+	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
+	CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
+	AN(req->vcl);
+	AZ(req->objcore);
+	AZ(req->err_code);
+
+	AZ(isnan(req->t_first));
+	AZ(isnan(req->t_prev));
+	AZ(isnan(req->t_req));
+
+	ci = SES_Get_String_Attr(req->sp, SA_CLIENT_IP);
+	cp = SES_Get_String_Attr(req->sp, SA_CLIENT_PORT);
+	VSLb(req->vsl, SLT_ReqStart, "%s %s", ci, cp);
+
+	http_VSL_log(req->http);
+
+	cnt_recv_prep(req, ci);
 
 	if (req->req_body_status == REQ_BODY_FAIL) {
 		req->doclose = SC_OVERLOAD;
@@ -806,10 +816,9 @@ cnt_recv(struct worker *wrk, struct req *req)
 
 	VCL_recv_method(req->vcl, wrk, req, NULL, NULL);
 	if (wrk->handling == VCL_RET_VCL && req->restarts == 0) {
-		req->director_hint = VCL_DefaultDirector(req->vcl);
 		HTTP_Copy(req->http, req->http0);
 		WS_Reset(req->ws, req->ws_req);
-		AN(req->director_hint);
+		cnt_recv_prep(req, ci);
 		VCL_recv_method(req->vcl, wrk, req, NULL, NULL);
 	}
 

From nils.goroll at uplex.de  Tue Nov  7 13:00:09 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Tue,  7 Nov 2017 13:00:09 +0000 (UTC)
Subject: [master] 9e7307b Reset the hitrate only for varnish restarts
Message-ID: <20171107130009.E9E88620F3@lists.varnish-cache.org>


commit 9e7307b7bc29bd8a7989192d581ac312b6d6c3c8
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Tue Nov 7 13:56:49 2017 +0100

    Reset the hitrate only for varnish restarts
    
    ... not for any vsm change.
    
    Fixes #2430

diff --git a/bin/varnishstat/varnishstat_curses.c b/bin/varnishstat/varnishstat_curses.c
index fb492f7..3f2b792 100644
--- a/bin/varnishstat/varnishstat_curses.c
+++ b/bin/varnishstat/varnishstat_curses.c
@@ -1004,13 +1004,14 @@ do_curses(struct vsm *vsm, struct vsc *vsc, double delay)
 
 	VSC_State(vsc, newpt, delpt, NULL);
 
-	rebuild = 1;
+	rebuild = VSM_WRK_RESTARTED;
 	while (keep_running) {
 		vsm_status = VSM_Status(vsm);
 		rebuild |= vsm_status & ~(VSM_MGT_RUNNING|VSM_WRK_RUNNING);
 		if (rebuild) {
 			(void)VSC_Iter(vsc, vsm, NULL, NULL);
-			init_hitrate();
+			if (rebuild & (VSM_MGT_RESTARTED|VSM_WRK_RESTARTED))
+				init_hitrate();
 			build_pt_array();
 			redraw = 1;
 		}

From phk at FreeBSD.org  Tue Nov  7 19:21:07 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Tue,  7 Nov 2017 19:21:07 +0000 (UTC)
Subject: [master] ea9bb00 Whitespace OCD
Message-ID: <20171107192107.823996201D@lists.varnish-cache.org>


commit ea9bb000a46f52b79048b285cde9ec8b6044eeb5
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Nov 7 08:56:57 2017 +0000

    Whitespace OCD

diff --git a/lib/libvcc/generate.py b/lib/libvcc/generate.py
index a5d0bd1..ee7d00e 100755
--- a/lib/libvcc/generate.py
+++ b/lib/libvcc/generate.py
@@ -1138,7 +1138,7 @@ fo.write("\n" + tbl40("#define VCL_MET_MASK", "0x%x\n" % ((1 << n) - 1)))
 fo.write("\n")
 for i in sorted(task.keys()):
 	fo.write(tbl40("#define VCL_MET_TASK_%s" % i.upper(),
-		       "( " + (" | \\\n%42s" % "").join(task[i]) + " )\n"))
+		       "( " + (" | \\\n\t\t\t\t\t  ").join(task[i]) + " )\n"))
 
 
 fo.write("\n/* VCL Returns */\n")

From phk at FreeBSD.org  Tue Nov  7 19:21:07 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Tue,  7 Nov 2017 19:21:07 +0000 (UTC)
Subject: [master] 45edc4d Move vlu to the private cli struct and turn ->cmd
 into a VSB.
Message-ID: <20171107192107.A21C66201F@lists.varnish-cache.org>


commit 45edc4df31fd8cababfcae52d9c5c01164c593cd
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Nov 7 09:06:45 2017 +0000

    Move vlu to the private cli struct and turn ->cmd into a VSB.

diff --git a/bin/varnishd/cache/cache_cli.c b/bin/varnishd/cache/cache_cli.c
index d597f42..ee542ec 100644
--- a/bin/varnishd/cache/cache_cli.c
+++ b/bin/varnishd/cache/cache_cli.c
@@ -73,7 +73,7 @@ cli_cb_before(const struct cli *cli)
 {
 
 	ASSERT_CLI();
-	VSL(SLT_CLI, 0, "Rd %s", cli->cmd);
+	VSL(SLT_CLI, 0, "Rd %s", VSB_data(cli->cmd));
 	VCL_Poll();
 	VBE_Poll();
 	Lck_Lock(&cli_mtx);
diff --git a/bin/varnishd/mgt/mgt_cli.c b/bin/varnishd/mgt/mgt_cli.c
index e9c214a..0d5f777 100644
--- a/bin/varnishd/mgt/mgt_cli.c
+++ b/bin/varnishd/mgt/mgt_cli.c
@@ -340,8 +340,8 @@ mgt_cli_cb_before(const struct cli *cli)
 {
 
 	if (cli->priv == stderr)
-		fprintf(stderr, "> %s\n", cli->cmd);
-	MGT_Complain(C_CLI, "CLI %s Rd %s", cli->ident, cli->cmd);
+		fprintf(stderr, "> %s\n", VSB_data(cli->cmd));
+	MGT_Complain(C_CLI, "CLI %s Rd %s", cli->ident, VSB_data(cli->cmd));
 }
 
 static void
@@ -351,7 +351,7 @@ mgt_cli_cb_after(const struct cli *cli)
 	MGT_Complain(C_CLI, "CLI %s Wr %03u %s",
 	    cli->ident, cli->result, VSB_data(cli->sb));
 	if (cli->priv == stderr &&
-	    cli->result != CLIS_OK && cli->cmd[0] != '-') {
+	    cli->result != CLIS_OK && *VSB_data(cli->cmd) != '-') {
 		MGT_Complain(C_ERR, "-I file CLI command failed (%d)\n%s\n",
 		    cli->result, VSB_data(cli->sb));
 		exit(2);
diff --git a/include/vcli_serve.h b/include/vcli_serve.h
index 941551d..a7b3471 100644
--- a/include/vcli_serve.h
+++ b/include/vcli_serve.h
@@ -34,7 +34,6 @@
 #include "vcli.h"
 
 struct cli;	/* NB: struct cli is opaque at this level.  */
-struct vlu;
 struct VCLS;
 
 typedef void cli_func_t(struct cli*, const char * const *av, void *priv);
@@ -68,18 +67,17 @@ struct cli_proto {
 
 /* a CLI session */
 struct cli {
-	unsigned                magic;
+	unsigned		magic;
 #define CLI_MAGIC		0x4038d570
 	void			*priv;
-	struct vsb              *sb;
-	enum VCLI_status_e      result;
-	char                    *cmd;
-	unsigned                auth;
-	char                    challenge[34];
-	char                    *ident;
-	struct vlu              *vlu;
-	struct VCLS             *cls;
-	volatile unsigned       *limit;
+	struct vsb		*sb;
+	enum VCLI_status_e	result;
+	struct vsb		*cmd;
+	unsigned		auth;
+	char			challenge[34];
+	char			*ident;
+	struct VCLS		*cls;
+	volatile unsigned	*limit;
 };
 
 /* The implementation must provide these functions */
diff --git a/lib/libvarnish/vcli_serve.c b/lib/libvarnish/vcli_serve.c
index ea6ea8d..0f68ec3 100644
--- a/lib/libvarnish/vcli_serve.c
+++ b/lib/libvarnish/vcli_serve.c
@@ -64,6 +64,7 @@ struct VCLS_fd {
 	struct vsb			*last_arg;
 	int				last_idx;
 	char				**argv;
+	struct vlu			*vlu;
 };
 
 struct VCLS {
@@ -342,9 +343,13 @@ cls_vlu(void *priv, const char *p)
 			continue;
 		if (*p == '\0')
 			return (0);
-		REPLACE(cli->cmd, p);
 		AN(p);	/* for FlexeLint */
 
+		cli->cmd = VSB_new(NULL, NULL, strlen(p) + 1, 0);
+		AN(cli->cmd);
+		VSB_cat(cli->cmd, p);
+		AZ(VSB_finish(cli->cmd));
+
 		/* We ignore a single leading '-' (for -I cli_file) */
 		if (p[0] == '-')
 			av = VAV_Parse(p + 1, NULL, 0);
@@ -354,8 +359,7 @@ cls_vlu(void *priv, const char *p)
 		if (av[0] != NULL) {
 			i = cls_vlu2(priv, av);
 			VAV_Free(av);
-			free(cli->cmd);
-			cli->cmd = NULL;
+			VSB_destroy(&cli->cmd);
 			return (i);
 		}
 		for (i = 1; av[i] != NULL; i++)
@@ -363,8 +367,7 @@ cls_vlu(void *priv, const char *p)
 		if (i < 3 || cli->auth == 0 || strcmp(av[i - 2], "<<")) {
 			i = cls_vlu2(priv, av);
 			VAV_Free(av);
-			free(cli->cmd);
-			cli->cmd = NULL;
+			VSB_destroy(&cli->cmd);
 			return (i);
 		}
 		cfd->argv = av;
@@ -391,8 +394,7 @@ cls_vlu(void *priv, const char *p)
 		cfd->argv[cfd->last_idx] = NULL;
 		VAV_Free(cfd->argv);
 		cfd->argv = NULL;
-		free(cli->cmd);
-		cli->cmd = NULL;
+		VSB_destroy(&cli->cmd);
 		VSB_destroy(&cfd->last_arg);
 		cfd->last_idx = 0;
 		return (i);
@@ -437,8 +439,8 @@ VCLS_AddFd(struct VCLS *cs, int fdi, int fdo, cls_cb_f *closefunc, void *priv)
 	cfd->fdo = fdo;
 	cfd->cli = &cfd->clis;
 	cfd->cli->magic = CLI_MAGIC;
-	cfd->cli->vlu = VLU_New(cls_vlu, cfd, *cs->maxlen);
-	AN(cfd->cli->vlu);
+	cfd->vlu = VLU_New(cls_vlu, cfd, *cs->maxlen);
+	AN(cfd->vlu);
 	cfd->cli->sb = VSB_new_auto();
 	AN(cfd->cli->sb);
 	cfd->cli->limit = cs->limit;
@@ -459,7 +461,7 @@ cls_close_fd(struct VCLS *cs, struct VCLS_fd *cfd)
 
 	VTAILQ_REMOVE(&cs->fds, cfd, list);
 	cs->nfd--;
-	VLU_Destroy(&cfd->cli->vlu);
+	VLU_Destroy(&cfd->vlu);
 	VSB_destroy(&cfd->cli->sb);
 	if (cfd->closefunc == NULL) {
 		(void)close(cfd->fdi);
@@ -538,7 +540,7 @@ VCLS_Poll(struct VCLS *cs, const struct cli *cli, int timeout)
 	if (pfd[0].revents & POLLHUP)
 		k = 1;
 	else
-		k = VLU_Fd(cfd->cli->vlu, cfd->fdi);
+		k = VLU_Fd(cfd->vlu, cfd->fdi);
 	if (k)
 		cls_close_fd(cs, cfd);
 	return (k);

From phk at FreeBSD.org  Tue Nov  7 19:21:07 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Tue,  7 Nov 2017 19:21:07 +0000 (UTC)
Subject: [master] f4e5187 Minor cleanup
Message-ID: <20171107192107.C441A62023@lists.varnish-cache.org>


commit f4e5187cbcdc21996712cfb57f338abee0e09b1e
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Nov 7 10:25:27 2017 +0000

    Minor cleanup

diff --git a/lib/libvarnish/vcli_serve.c b/lib/libvarnish/vcli_serve.c
index 0f68ec3..9cde8b1 100644
--- a/lib/libvarnish/vcli_serve.c
+++ b/lib/libvarnish/vcli_serve.c
@@ -235,9 +235,8 @@ cls_dispatch(struct cli *cli, const struct cli_proto *cp,
  */
 
 static int
-cls_vlu2(void *priv, char * const *av)
+cls_exec(struct VCLS_fd *cfd, char * const *av)
 {
-	struct VCLS_fd *cfd;
 	struct VCLS *cs;
 	struct cli_proto *clp;
 	struct cli *cli;
@@ -247,7 +246,7 @@ cls_vlu2(void *priv, char * const *av)
 	unsigned lim;
 	const char *trunc = "!\n[response was truncated]\n";
 
-	CAST_OBJ_NOTNULL(cfd, priv, VCLS_FD_MAGIC);
+	CHECK_OBJ_NOTNULL(cfd, VCLS_FD_MAGIC);
 	cs = cfd->cls;
 	CHECK_OBJ_NOTNULL(cs, VCLS_MAGIC);
 
@@ -325,7 +324,7 @@ cls_vlu(void *priv, const char *p)
 {
 	struct VCLS_fd *cfd;
 	struct cli *cli;
-	int i;
+	int i, ac;
 	char **av;
 
 	CAST_OBJ_NOTNULL(cfd, priv, VCLS_FD_MAGIC);
@@ -352,26 +351,24 @@ cls_vlu(void *priv, const char *p)
 
 		/* We ignore a single leading '-' (for -I cli_file) */
 		if (p[0] == '-')
-			av = VAV_Parse(p + 1, NULL, 0);
+			av = VAV_Parse(p + 1, &ac, 0);
 		else
-			av = VAV_Parse(p, NULL, 0);
+			av = VAV_Parse(p, &ac, 0);
 		AN(av);
 		if (av[0] != NULL) {
-			i = cls_vlu2(priv, av);
+			i = cls_exec(cfd, av);
 			VAV_Free(av);
 			VSB_destroy(&cli->cmd);
 			return (i);
 		}
-		for (i = 1; av[i] != NULL; i++)
-			continue;
-		if (i < 3 || cli->auth == 0 || strcmp(av[i - 2], "<<")) {
-			i = cls_vlu2(priv, av);
+		if (ac < 3 || cli->auth == 0 || strcmp(av[ac - 2], "<<")) {
+			i = cls_exec(cfd, av);
 			VAV_Free(av);
 			VSB_destroy(&cli->cmd);
 			return (i);
 		}
 		cfd->argv = av;
-		cfd->last_idx = i - 2;
+		cfd->last_idx = ac - 2;
 		cfd->last_arg = VSB_new_auto();
 		AN(cfd->last_arg);
 		return (0);
@@ -390,7 +387,7 @@ cls_vlu(void *priv, const char *p)
 		free(cfd->argv[cfd->last_idx + 1]);
 		cfd->argv[cfd->last_idx + 1] = NULL;
 		cfd->argv[cfd->last_idx] = VSB_data(cfd->last_arg);
-		i = cls_vlu2(priv, cfd->argv);
+		i = cls_exec(cfd, cfd->argv);
 		cfd->argv[cfd->last_idx] = NULL;
 		VAV_Free(cfd->argv);
 		cfd->argv = NULL;

From phk at FreeBSD.org  Tue Nov  7 19:21:07 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Tue,  7 Nov 2017 19:21:07 +0000 (UTC)
Subject: [master] fd3fb35 Staticize
Message-ID: <20171107192107.E7BFD62027@lists.varnish-cache.org>


commit fd3fb3527f7b4ff7978c65d7398f20424f937179
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Nov 7 11:57:38 2017 +0000

    Staticize

diff --git a/lib/libvmod_debug/vmod_debug.c b/lib/libvmod_debug/vmod_debug.c
index ad6b6a5..3493578 100644
--- a/lib/libvmod_debug/vmod_debug.c
+++ b/lib/libvmod_debug/vmod_debug.c
@@ -65,7 +65,7 @@ struct priv_vcl {
 
 static VCL_DURATION vcl_release_delay = 0.0;
 
-pthread_mutex_t vsc_mtx = PTHREAD_MUTEX_INITIALIZER;
+static pthread_mutex_t vsc_mtx = PTHREAD_MUTEX_INITIALIZER;
 static struct VSC_debug *vsc;
 
 VCL_VOID __match_proto__(td_debug_panic)

From phk at FreeBSD.org  Tue Nov  7 19:21:08 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Tue,  7 Nov 2017 19:21:08 +0000 (UTC)
Subject: [master] 6cb21b4 Get rid of the cli_buffer parameter for good.
Message-ID: <20171107192108.1772962036@lists.varnish-cache.org>


commit 6cb21b47a16be6b97b8197dd3cb79cef42999273
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Nov 7 19:17:54 2017 +0000

    Get rid of the cli_buffer parameter for good.
    
    Rewrite the CLI command acceptance to not use the VLU functions,
    but a small state machine.
    
    Unauthenticated CLI sessions have a hard limit of 80 char cmds
    and cannot use the "<< nonce" construct.

diff --git a/bin/varnishd/cache/cache_cli.c b/bin/varnishd/cache/cache_cli.c
index ee542ec..bdaa4ae 100644
--- a/bin/varnishd/cache/cache_cli.c
+++ b/bin/varnishd/cache/cache_cli.c
@@ -100,6 +100,7 @@ CLI_Run(void)
 	cli = VCLS_AddFd(cache_cls,
 	    heritage.cli_in, heritage.cli_out, NULL, NULL);
 	AN(cli);
+	cli->auth = 1;	// Non-zero to disable paranoia in vcli_serve
 
 	do {
 		i = VCLS_Poll(cache_cls, cli, -1);
@@ -126,8 +127,9 @@ CLI_Init(void)
 	Lck_New(&cli_mtx, lck_cli);
 	cli_thread = pthread_self();
 
-	cache_cls = heritage.cls;
+	cache_cls = VCLS_New(heritage.cls);
 	AN(cache_cls);
+	VCLS_SetLimit(cache_cls, &cache_param->cli_limit);
 	VCLS_SetHooks(cache_cls, cli_cb_before, cli_cb_after);
 
 	CLI_AddFuncs(cli_cmds);
diff --git a/bin/varnishd/mgt/mgt_cli.c b/bin/varnishd/mgt/mgt_cli.c
index 0d5f777..a25cc92 100644
--- a/bin/varnishd/mgt/mgt_cli.c
+++ b/bin/varnishd/mgt/mgt_cli.c
@@ -364,8 +364,9 @@ void
 mgt_cli_init_cls(void)
 {
 
-	mgt_cls = VCLS_New(&mgt_param.cli_buffer, &mgt_param.cli_limit);
+	mgt_cls = VCLS_New(NULL);
 	AN(mgt_cls);
+	VCLS_SetLimit(mgt_cls, &mgt_param.cli_limit);
 	VCLS_SetHooks(mgt_cls, mgt_cli_cb_before, mgt_cli_cb_after);
 	VCLS_AddFunc(mgt_cls, MCF_NOAUTH, cli_auth);
 	VCLS_AddFunc(mgt_cls, MCF_AUTH, cli_proto);
diff --git a/include/vcli_serve.h b/include/vcli_serve.h
index a7b3471..eff8a4b 100644
--- a/include/vcli_serve.h
+++ b/include/vcli_serve.h
@@ -90,8 +90,9 @@ void VCLI_SetResult(struct cli *cli, unsigned r);
 
 typedef void cls_cb_f(void *priv);
 typedef void cls_cbc_f(const struct cli*);
-struct VCLS *VCLS_New(volatile unsigned *maxlen, volatile unsigned *limit);
+struct VCLS *VCLS_New(struct VCLS *);
 void VCLS_SetHooks(struct VCLS *, cls_cbc_f *, cls_cbc_f *);
+void VCLS_SetLimit(struct VCLS *, volatile unsigned *);
 struct cli *VCLS_AddFd(struct VCLS *cs, int fdi, int fdo, cls_cb_f *closefunc,
     void *priv);
 void VCLS_AddFunc(struct VCLS *cs, unsigned auth, struct cli_proto *clp);
diff --git a/lib/libvarnish/vcli_serve.c b/lib/libvarnish/vcli_serve.c
index 9cde8b1..71c2544 100644
--- a/lib/libvarnish/vcli_serve.c
+++ b/lib/libvarnish/vcli_serve.c
@@ -49,7 +49,6 @@
 
 #include "vav.h"
 #include "vcli_serve.h"
-#include "vlu.h"
 #include "vsb.h"
 
 struct VCLS_fd {
@@ -62,9 +61,9 @@ struct VCLS_fd {
 	cls_cb_f			*closefunc;
 	void				*priv;
 	struct vsb			*last_arg;
-	int				last_idx;
 	char				**argv;
-	struct vlu			*vlu;
+	int				argc;
+	char				*match;
 };
 
 struct VCLS {
@@ -74,7 +73,6 @@ struct VCLS {
 	unsigned			nfd;
 	VTAILQ_HEAD(,cli_proto)		funcs;
 	cls_cbc_f			*before, *after;
-	volatile unsigned		*maxlen;
 	volatile unsigned		*limit;
 	struct cli_proto		*wildcard;
 };
@@ -244,6 +242,7 @@ cls_exec(struct VCLS_fd *cfd, char * const *av)
 	ssize_t len;
 	char *s;
 	unsigned lim;
+	int retval = 0;
 	const char *trunc = "!\n[response was truncated]\n";
 
 	CHECK_OBJ_NOTNULL(cfd, VCLS_FD_MAGIC);
@@ -314,105 +313,140 @@ cls_exec(struct VCLS_fd *cfd, char * const *av)
 	}
 	if (VCLI_WriteResult(cfd->fdo, cli->result, s) ||
 	    cli->result == CLIS_CLOSE)
-		return (1);
+		retval = 1;
 
-	return (0);
+	/*
+	 * In unauthenticated mode we are very intolerant, and close the
+	 * connection at the least provocation.
+	 */
+	if (cli->auth == 0 && cli->result != CLIS_OK)
+		retval = 1;
+
+	return (retval);
 }
 
 static int
-cls_vlu(void *priv, const char *p)
+cls_feed(struct VCLS_fd *cfd, const char *p, const char *e)
 {
-	struct VCLS_fd *cfd;
 	struct cli *cli;
-	int i, ac;
-	char **av;
+	int i, retval = 0, ac;
+	char **av, *q;
 
-	CAST_OBJ_NOTNULL(cfd, priv, VCLS_FD_MAGIC);
+	CHECK_OBJ_NOTNULL(cfd, VCLS_FD_MAGIC);
 	AN(p);
+	assert(e > p);
 
 	cli = cfd->cli;
 	CHECK_OBJ_NOTNULL(cli, CLI_MAGIC);
 
-	if (cfd->argv == NULL) {
-		/*
-		 * Lines with only whitespace are simply ignored, in order
-		 * to not complicate CLI-client side scripts and TELNET users
-		 */
-		for (; isspace(*p); p++)
+	for(;p < e; p++) {
+		if (cli->cmd == NULL && isspace(*p)) {
+			/* Ignore all leading space before cmd */
 			continue;
-		if (*p == '\0')
-			return (0);
-		AN(p);	/* for FlexeLint */
-
-		cli->cmd = VSB_new(NULL, NULL, strlen(p) + 1, 0);
-		AN(cli->cmd);
-		VSB_cat(cli->cmd, p);
-		AZ(VSB_finish(cli->cmd));
-
-		/* We ignore a single leading '-' (for -I cli_file) */
-		if (p[0] == '-')
-			av = VAV_Parse(p + 1, &ac, 0);
-		else
-			av = VAV_Parse(p, &ac, 0);
-		AN(av);
-		if (av[0] != NULL) {
-			i = cls_exec(cfd, av);
-			VAV_Free(av);
-			VSB_destroy(&cli->cmd);
-			return (i);
-		}
-		if (ac < 3 || cli->auth == 0 || strcmp(av[ac - 2], "<<")) {
-			i = cls_exec(cfd, av);
-			VAV_Free(av);
-			VSB_destroy(&cli->cmd);
-			return (i);
 		}
-		cfd->argv = av;
-		cfd->last_idx = ac - 2;
-		cfd->last_arg = VSB_new_auto();
-		AN(cfd->last_arg);
-		return (0);
-	} else {
-		AN(cfd->argv[cfd->last_idx]);
-		AZ(strcmp(cfd->argv[cfd->last_idx], "<<"));
-		AN(cfd->argv[cfd->last_idx + 1]);
-		if (strcmp(p, cfd->argv[cfd->last_idx + 1])) {
-			VSB_cat(cfd->last_arg, p);
-			VSB_cat(cfd->last_arg, "\n");
-			return (0);
+		if (cfd->argv == NULL) {
+
+			/* Collect first line up to \n or \r */
+			if (cli->cmd == NULL) {
+				cli->cmd = VSB_new_auto();
+				AN(cli->cmd);
+			}
+
+			/* Until authenticated, limit length hard */
+			if (*p != '\n' && *p != '\r' &&
+			    (cli->auth > 0 || VSB_len(cli->cmd) < 80)) {
+				VSB_putc(cli->cmd, *p);
+				continue;
+			}
+
+			AZ(VSB_finish(cli->cmd));
+
+			/* Ignore leading '-' */
+			q = VSB_data(cli->cmd);
+			if (*q == '-')
+				q++;
+			av = VAV_Parse(q, &ac, 0);
+			AN(av);
+
+			if (cli->auth > 0 &&
+			    av[0] == NULL &&
+			    ac >= 3 &&
+			    !strcmp(av[ac-2], "<<") &&
+			    *av[ac - 1] != '\0') {
+				/* Go to "<< nonce" mode */
+				cfd->argv = av;
+				cfd->argc = ac;
+				cfd->match = av[ac - 1];
+				cfd->last_arg = VSB_new_auto();
+				AN(cfd->last_arg);
+			} else {
+				/* Plain command */
+				i = cls_exec(cfd, av);
+				VAV_Free(av);
+				VSB_destroy(&cli->cmd);
+				if (i)
+					return(i);
+			}
+		} else {
+			/* "<< nonce" mode */
+			AN(cfd->argv);
+			AN(cfd->argc);
+			AN(cfd->match);
+			AN(cfd->last_arg);
+			if (*cfd->match == '\0' && (*p == '\r' || *p == '\n')) {
+				AZ(VSB_finish(cfd->last_arg));
+				// NB: VAV lib internals trusted
+				REPLACE(cfd->argv[cfd->argc - 1], NULL);
+				REPLACE(cfd->argv[cfd->argc - 2], NULL);
+				cfd->argv[cfd->argc - 2] =
+				    VSB_data(cfd->last_arg);
+				i = cls_exec(cfd, cfd->argv);
+				cfd->argv[cfd->argc - 2] = NULL;
+				VAV_Free(cfd->argv);
+				cfd->argv = NULL;
+				VSB_destroy(&cfd->last_arg);
+				VSB_destroy(&cli->cmd);
+				if (i)
+					return (i);
+			} else if (*p == *cfd->match) {
+				cfd->match++;
+			} else if (cfd->match != cfd->argv[cfd->argc - 1]) {
+				q = cfd->argv[cfd->argc - 1];
+				VSB_bcat(cfd->last_arg, q, cfd->match - q);
+				cfd->match = q;
+				VSB_putc(cfd->last_arg, *p);
+			} else {
+				VSB_putc(cfd->last_arg, *p);
+			}
 		}
-		AZ(VSB_finish(cfd->last_arg));
-		free(cfd->argv[cfd->last_idx]);
-		cfd->argv[cfd->last_idx] = NULL;
-		free(cfd->argv[cfd->last_idx + 1]);
-		cfd->argv[cfd->last_idx + 1] = NULL;
-		cfd->argv[cfd->last_idx] = VSB_data(cfd->last_arg);
-		i = cls_exec(cfd, cfd->argv);
-		cfd->argv[cfd->last_idx] = NULL;
-		VAV_Free(cfd->argv);
-		cfd->argv = NULL;
-		VSB_destroy(&cli->cmd);
-		VSB_destroy(&cfd->last_arg);
-		cfd->last_idx = 0;
-		return (i);
 	}
+	return (retval);
 }
 
 struct VCLS *
-VCLS_New(volatile unsigned *maxlen, volatile unsigned *limit)
+VCLS_New(struct VCLS *model)
 {
 	struct VCLS *cs;
 
+	CHECK_OBJ_ORNULL(model, VCLS_MAGIC);
+
 	ALLOC_OBJ(cs, VCLS_MAGIC);
 	AN(cs);
 	VTAILQ_INIT(&cs->fds);
 	VTAILQ_INIT(&cs->funcs);
-	cs->maxlen = maxlen;
-	cs->limit = limit;
+	if (model != NULL)
+		VTAILQ_CONCAT(&cs->funcs, &model->funcs, list);
 	return (cs);
 }
 
 void
+VCLS_SetLimit(struct VCLS *cs, volatile unsigned *limit)
+{
+	CHECK_OBJ_NOTNULL(cs, VCLS_MAGIC);
+	cs->limit = limit;
+}
+
+void
 VCLS_SetHooks(struct VCLS *cs, cls_cbc_f *before, cls_cbc_f *after)
 {
 
@@ -436,8 +470,6 @@ VCLS_AddFd(struct VCLS *cs, int fdi, int fdo, cls_cb_f *closefunc, void *priv)
 	cfd->fdo = fdo;
 	cfd->cli = &cfd->clis;
 	cfd->cli->magic = CLI_MAGIC;
-	cfd->vlu = VLU_New(cls_vlu, cfd, *cs->maxlen);
-	AN(cfd->vlu);
 	cfd->cli->sb = VSB_new_auto();
 	AN(cfd->cli->sb);
 	cfd->cli->limit = cs->limit;
@@ -458,7 +490,6 @@ cls_close_fd(struct VCLS *cs, struct VCLS_fd *cfd)
 
 	VTAILQ_REMOVE(&cs->fds, cfd, list);
 	cs->nfd--;
-	VLU_Destroy(&cfd->vlu);
 	VSB_destroy(&cfd->cli->sb);
 	if (cfd->closefunc == NULL) {
 		(void)close(cfd->fdi);
@@ -510,6 +541,7 @@ VCLS_Poll(struct VCLS *cs, const struct cli *cli, int timeout)
 	struct VCLS_fd *cfd;
 	struct pollfd pfd[1];
 	int i, j, k;
+	char buf[BUFSIZ];
 
 	CHECK_OBJ_NOTNULL(cs, VCLS_MAGIC);
 	if (cs->nfd == 0) {
@@ -536,8 +568,13 @@ VCLS_Poll(struct VCLS *cs, const struct cli *cli, int timeout)
 		return (j);
 	if (pfd[0].revents & POLLHUP)
 		k = 1;
-	else
-		k = VLU_Fd(cfd->vlu, cfd->fdi);
+	else {
+		i = read(cfd->fdi, buf, sizeof buf);
+		if (i <= 0)
+			k = 1;
+		else
+			k = cls_feed(cfd, buf, buf + i);
+	}
 	if (k)
 		cls_close_fd(cs, cfd);
 	return (k);

From nils.goroll at uplex.de  Wed Nov  8 07:31:06 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Wed,  8 Nov 2017 07:31:06 +0000 (UTC)
Subject: [master] 75744c8 Notes after another review of restarts changes
Message-ID: <20171108073106.8091062424@lists.varnish-cache.org>


commit 75744c85a94ac2c4aaaeb10f107462f7a11656db
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Wed Nov 8 08:10:02 2017 +0100

    Notes after another review of restarts changes

diff --git a/bin/varnishd/cache/cache_req.c b/bin/varnishd/cache/cache_req.c
index 2f1014f..6ee3050 100644
--- a/bin/varnishd/cache/cache_req.c
+++ b/bin/varnishd/cache/cache_req.c
@@ -175,6 +175,7 @@ Req_Release(struct req *req)
 }
 
 /*----------------------------------------------------------------------
+ * TODO: remove code duplication with cnt_recv_prep
  */
 
 void
diff --git a/bin/varnishd/cache/cache_req_fsm.c b/bin/varnishd/cache/cache_req_fsm.c
index cbf3576..c593e93 100644
--- a/bin/varnishd/cache/cache_req_fsm.c
+++ b/bin/varnishd/cache/cache_req_fsm.c
@@ -741,6 +741,10 @@ cnt_restart(struct worker *wrk, struct req *req)
 /*
  * prepare the request for vcl_recv, either initially or after a reset
  * e.g. due to vcl switching
+ *
+ * TODO
+ * - make restarts == 0 bit re-usable for rollback
+ * - remove duplicatation with Req_Cleanup()
  */
 
 static void

From nils.goroll at uplex.de  Wed Nov  8 07:31:06 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Wed,  8 Nov 2017 07:31:06 +0000 (UTC)
Subject: [master] 4c20c84 storage and hash control attributes should also be
 writable
Message-ID: <20171108073106.9A95662426@lists.varnish-cache.org>


commit 4c20c843ade51c30ec98a910f3da4a78ec464513
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Wed Nov 8 08:14:51 2017 +0100

    storage and hash control attributes should also be writable
    
    Afterthought on #2405:
    
    The usage pattern we want to get to is (pseudo vcl, don't take
    the syntax for granted)
    
    	sub vcl_whatever_client_sub {
    		std.rollback(req);
    		set req.<whatever>;
    		...
    		return (restart);
    	}
    
    The hash and storage controls should be no exception

diff --git a/doc/changes.rst b/doc/changes.rst
index f96778a..d900b93 100644
--- a/doc/changes.rst
+++ b/doc/changes.rst
@@ -10,6 +10,10 @@ Varnish Cache Trunk (ongoing)
   Restarts now leave all the request properties in place except for
   ``req.restarts`` and ``req.xid``, which need to change by design.
 
+* ``req.storage``, ``req.hash_ignore_busy`` and
+  ``req.hash_always_miss`` are now accessible from all of the client
+  side subs, not just ``vcl_recv{}``
+
 ================================
 Varnish Cache 5.2.0 (2017-09-15)
 ================================
diff --git a/lib/libvcc/generate.py b/lib/libvcc/generate.py
index ee7d00e..524e4b3 100755
--- a/lib/libvcc/generate.py
+++ b/lib/libvcc/generate.py
@@ -271,7 +271,7 @@ sp_variables = [
 	('req.storage',
 		'STEVEDORE',
 		('client',),
-		('recv',), """
+		('client',), """
 		The storage backend to use to save this request body.
 		"""
 	),
@@ -335,7 +335,7 @@ sp_variables = [
 	('req.hash_ignore_busy',
 		'BOOL',
 		('client',),
-		('recv',), """
+		('client',), """
 		Ignore any busy object during cache lookup. You
 		would want to do this if you have two server looking
 		up content from each other to avoid potential deadlocks.
@@ -344,7 +344,7 @@ sp_variables = [
 	('req.hash_always_miss',
 		'BOOL',
 		('client',),
-		('recv',), """
+		('client',), """
 		Force a cache miss for this request. If set to true
 		Varnish will disregard any existing objects and
 		always (re)fetch from the backend.

From nils.goroll at uplex.de  Wed Nov  8 07:31:06 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Wed,  8 Nov 2017 07:31:06 +0000 (UTC)
Subject: [master] 5aaf7cb pick up loose ends of cli_buffer removal
Message-ID: <20171108073106.C612E62429@lists.varnish-cache.org>


commit 5aaf7cb3507806e5bb0bc0fceb2fc1f676d7489f
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Wed Nov 8 08:25:10 2017 +0100

    pick up loose ends of cli_buffer removal
    
    Ref: 6cb21b47a16be6b97b8197dd3cb79cef42999273
         #2382

diff --git a/bin/varnishtest/tests/r02382.vtc b/bin/varnishtest/tests/r02382.vtc
deleted file mode 100644
index 7a398b3..0000000
--- a/bin/varnishtest/tests/r02382.vtc
+++ /dev/null
@@ -1,21 +0,0 @@
-varnishtest "Very very big cli_buffer"
-
-# If the cli_buffer is on the stack, setting it very big can crash varnish
-
-server s1 {
-       rxreq
-       expect req.url == "/1"
-       txresp
-} -start
-
-varnish v1 -arg "-p cli_buffer=32M" -vcl+backend {
-} -start
-
-varnish v1 -cliok "ping"
-
-delay .5
-
-client c1 {
-       txreq -url /1
-       rxresp
-} -run
diff --git a/doc/changes.rst b/doc/changes.rst
index d900b93..f25fd7c 100644
--- a/doc/changes.rst
+++ b/doc/changes.rst
@@ -14,11 +14,13 @@ Varnish Cache Trunk (ongoing)
   ``req.hash_always_miss`` are now accessible from all of the client
   side subs, not just ``vcl_recv{}``
 
+* The ``cli_buffer`` parameter has been removed
+
 ================================
 Varnish Cache 5.2.0 (2017-09-15)
 ================================
 
-* The cli_buffer parameter has been deprecated (2382_)
+* The ``cli_buffer`` parameter has been deprecated (2382_)
 
 .. _2382: https://github.com/varnishcache/varnish-cache/pull/2382
 
diff --git a/include/tbl/params.h b/include/tbl/params.h
index 6560666..7bf45e9 100644
--- a/include/tbl/params.h
+++ b/include/tbl/params.h
@@ -286,21 +286,6 @@ PARAM(
 )
 
 PARAM(
-	/* name */	cli_buffer,
-	/* typ */	bytes_u,
-	/* min */	"4k",
-	/* max */	NULL,
-	/* default */	"8k",
-	/* units */	"bytes",
-	/* flags */	0,
-	/* s-text */
-	"DEPRECATED: This parameter is ignored.\n"
-	"Memory for the CLI command buffer is now dynamically allocated.",
-	/* l-text */	"",
-	/* func */	NULL
-)
-
-PARAM(
 	/* name */	cli_limit,
 	/* typ */	bytes_u,
 	/* min */	"128b",

From nils.goroll at uplex.de  Wed Nov  8 08:06:05 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Wed,  8 Nov 2017 08:06:05 +0000 (UTC)
Subject: [master] 11ff7d5 vtc -wait-running should wait for varnish to accept
Message-ID: <20171108080605.EB74D621BE@lists.varnish-cache.org>


commit 11ff7d5dfece888661ee68cdf60be42bf8e82be0
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Wed Nov 8 09:02:03 2017 +0100

    vtc -wait-running should wait for varnish to accept
    
    I wonder if maybe varnishd start should not return before accepting?

diff --git a/bin/varnishtest/vtc_varnish.c b/bin/varnishtest/vtc_varnish.c
index b2daae7..afc346c 100644
--- a/bin/varnishtest/vtc_varnish.c
+++ b/bin/varnishtest/vtc_varnish.c
@@ -172,6 +172,11 @@ wait_running(const struct varnish *v)
 			vtc_fatal(v->vl,
 			    "Child stopped before running: %u %s", st, r);
 		if (!strcmp(r, "Child in state running")) {
+			st = varnish_ask_cli(v, "debug.listen_address", &r);
+			if (st != CLIS_OK)
+				vtc_fatal(v->vl,
+					  "CLI status command failed: %u %s",
+					  st, r);
 			free(r);
 			break;
 		}

From nils.goroll at uplex.de  Wed Nov  8 08:06:06 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Wed,  8 Nov 2017 08:06:06 +0000 (UTC)
Subject: [master] 422c6ed v10.vtc: remove now obsolete delay hacks
Message-ID: <20171108080606.1A890621C1@lists.varnish-cache.org>


commit 422c6ed099b4f4cebfce1d37ff97c1510e237468
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Wed Nov 8 09:02:46 2017 +0100

    v10.vtc: remove now obsolete delay hacks

diff --git a/bin/varnishtest/tests/v00010.vtc b/bin/varnishtest/tests/v00010.vtc
index 71fa666..7e14464 100644
--- a/bin/varnishtest/tests/v00010.vtc
+++ b/bin/varnishtest/tests/v00010.vtc
@@ -60,8 +60,6 @@ varnish v1 -cliok "start"
 varnish v1 -wait-running
 barrier b1 sync
 
-delay 0.5
-
 client c1 {
 	txreq -url "/"
 	rxresp
@@ -78,8 +76,6 @@ varnish v1 -cliok "start"
 varnish v1 -wait-running
 barrier b2 sync
 
-delay 0.5
-
 client c1 {
 	txreq -url "/"
 	rxresp

From nils.goroll at uplex.de  Wed Nov  8 08:52:06 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Wed,  8 Nov 2017 08:52:06 +0000 (UTC)
Subject: [master] 08b309c more changelog tlc
Message-ID: <20171108085206.1E46362180@lists.varnish-cache.org>


commit 08b309ce91e2a5d257c33e4129d488558bb8d1eb
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Wed Nov 8 09:47:02 2017 +0100

    more changelog tlc
    
    Please do not assume this to be complete since 5.2 release
    
    Please do not even assume my XXXes to be completely referencing the missing bits.
    
    Waving @slimhazard / Geoff from the ICE train and Berlin U-Bahn/S-Bahn

diff --git a/doc/changes.rst b/doc/changes.rst
index f25fd7c..be60077 100644
--- a/doc/changes.rst
+++ b/doc/changes.rst
@@ -2,10 +2,23 @@
 Varnish Cache Trunk (ongoing)
 =============================
 
+Usage
+-----
+
 * Fixed implementation of the ``max_restarts`` limit: It used to be one
   less than the number of allowed restarts, it now is the number of
   ``return(restart)`` calls per request.
 
+* The ``cli_buffer`` parameter has been removed
+
+* Added back ``umem`` storage for Solaris descendents
+
+* The new storage backend type (stevedore) ``default`` now resolves to
+  either ``umem`` (where available) or ``malloc``.
+
+VCL
+---
+
 * Fix behaviour of restarts to how it was originally intended:
   Restarts now leave all the request properties in place except for
   ``req.restarts`` and ``req.xid``, which need to change by design.
@@ -14,7 +27,45 @@ Varnish Cache Trunk (ongoing)
   ``req.hash_always_miss`` are now accessible from all of the client
   side subs, not just ``vcl_recv{}``
 
-* The ``cli_buffer`` parameter has been removed
+C APIs (for vmod and utility authors)
+-------------------------------------
+
+* We have now defined three API Stability levels: ``VRT``,
+  ``PACKAGE``, ``SOURCE``. XXX: someone should write up an rst when
+  we've settled this.
+
+* New API namespace rules, see `phk_api_spaces_`
+
+* Rules for including API headers have been changed:
+  * many headers can now only be included once
+  * some headers require specific include ordering
+  * only ``cache.h`` _or_ ``vrt.h`` can be included
+
+  XXX: More details?
+
+* Signatures of functions in the VLU API for bytestream into text
+  serialization have been changed
+
+* vcl.h now contains convenience macros ``VCL_MET_TASK_B``,
+  ``VCL_MET_TASK_C`` and ``VCL_MET_TASK_H`` for checking
+  ``ctx->method`` for backend, client and housekeeping
+  (vcl_init/vcl_fini) task context
+
+* vcc files can now contain a ``$Prefix`` stanza to define the prefix
+  for vmod function names (which was fixed to ``vmod`` before)
+
+* All varnish internal ``SHA256*`` symbols have been renamed to
+``VSHA256*``
+
+* libvarnish now has ``VNUM_duration()`` to convert from a VCL
+  duration like 4h or 5s
+
+* director health state queries have been merged to ``VRT_Healthy()``
+
+Fixed bugs
+----------
+
+XXX TODO
 
 ================================
 Varnish Cache 5.2.0 (2017-09-15)
diff --git a/doc/sphinx/whats-new/upgrading-5.2.rst b/doc/sphinx/whats-new/upgrading-5.2.rst
index 9d02522..fa137c3 100644
--- a/doc/sphinx/whats-new/upgrading-5.2.rst
+++ b/doc/sphinx/whats-new/upgrading-5.2.rst
@@ -13,7 +13,7 @@ counters, but these should all be transparent at the user-level.
 varnishd parameters
 ===================
 
-The :ref:`ref_param_vsm_space` and :ref:`ref_param_cli_buffer`
+The :ref:`ref_param_vsm_space` and ``cli_buffer``
 parameters are now deprecated and ignored.  They will be removed
 in a future major release.
 

From phk at FreeBSD.org  Wed Nov  8 09:51:35 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Wed,  8 Nov 2017 09:51:35 +0000 (UTC)
Subject: [master] feb47d2 Fix formatting
Message-ID: <20171108095135.9526562491@lists.varnish-cache.org>


commit feb47d2641a45a309a984ddd2be5df350df923eb
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Nov 8 09:49:50 2017 +0000

    Fix formatting

diff --git a/doc/changes.rst b/doc/changes.rst
index be60077..1fef6c9 100644
--- a/doc/changes.rst
+++ b/doc/changes.rst
@@ -55,7 +55,7 @@ C APIs (for vmod and utility authors)
   for vmod function names (which was fixed to ``vmod`` before)
 
 * All varnish internal ``SHA256*`` symbols have been renamed to
-``VSHA256*``
+  ``VSHA256*``
 
 * libvarnish now has ``VNUM_duration()`` to convert from a VCL
   duration like 4h or 5s

From nils.goroll at uplex.de  Wed Nov  8 12:08:08 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Wed,  8 Nov 2017 12:08:08 +0000 (UTC)
Subject: [master] f863ec1 gc (struct exp_priv).cb_rwl
Message-ID: <20171108120808.163B06257F@lists.varnish-cache.org>


commit f863ec15460c530f060104cda5e4b2b68fe44456
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Wed Nov 8 13:04:21 2017 +0100

    gc (struct exp_priv).cb_rwl
    
    unused since 992d5250bfad375fad376a20b7fdaafc834d1ee0

diff --git a/bin/varnishd/cache/cache_expire.c b/bin/varnishd/cache/cache_expire.c
index a9b7a7e..303b51f 100644
--- a/bin/varnishd/cache/cache_expire.c
+++ b/bin/varnishd/cache/cache_expire.c
@@ -51,8 +51,6 @@ struct exp_priv {
 	VSTAILQ_HEAD(,objcore)		inbox;
 	struct binheap			*heap;
 	pthread_cond_t			condvar;
-
-	pthread_rwlock_t		cb_rwl;
 };
 
 static struct exp_priv *exphdl;
@@ -360,7 +358,6 @@ EXP_Init(void)
 	Lck_New(&ep->mtx, lck_exp);
 	AZ(pthread_cond_init(&ep->condvar, NULL));
 	VSTAILQ_INIT(&ep->inbox);
-	AZ(pthread_rwlock_init(&ep->cb_rwl, NULL));
 	exphdl = ep;
 	WRK_BgThread(&pt, "cache-timeout", exp_thread, ep);
 }

From nils.goroll at uplex.de  Wed Nov  8 12:08:08 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Wed,  8 Nov 2017 12:08:08 +0000 (UTC)
Subject: [master] 6db0548 better name for the expiry thread
Message-ID: <20171108120808.3125E62581@lists.varnish-cache.org>


commit 6db0548ea2fc706f56b3f7b589f41ff1212532cb
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Wed Nov 8 13:05:12 2017 +0100

    better name for the expiry thread

diff --git a/bin/varnishd/cache/cache_expire.c b/bin/varnishd/cache/cache_expire.c
index 303b51f..fc6e9b9 100644
--- a/bin/varnishd/cache/cache_expire.c
+++ b/bin/varnishd/cache/cache_expire.c
@@ -359,5 +359,5 @@ EXP_Init(void)
 	AZ(pthread_cond_init(&ep->condvar, NULL));
 	VSTAILQ_INIT(&ep->inbox);
 	exphdl = ep;
-	WRK_BgThread(&pt, "cache-timeout", exp_thread, ep);
+	WRK_BgThread(&pt, "cache-exp", exp_thread, ep);
 }

From phk at FreeBSD.org  Wed Nov  8 12:27:05 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Wed,  8 Nov 2017 12:27:05 +0000 (UTC)
Subject: [master] c2e16df Make the vtc subprocess a processgroup leader,
 and kill the entire process group on timeout.
Message-ID: <20171108122705.9670762D8B@lists.varnish-cache.org>


commit c2e16dfd694af880cb60b64b3951b6aa221e8778
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Nov 8 12:23:25 2017 +0000

    Make the vtc subprocess a processgroup leader, and kill the
    entire process group on timeout.
    
    This still leaves the case where the process group leader exits
    without a timeout but some of its subprocesses failed to stop.
    
    Relevant to: #2469

diff --git a/bin/varnishtest/vtc_main.c b/bin/varnishtest/vtc_main.c
index 0fb3a9b..4df1af0 100644
--- a/bin/varnishtest/vtc_main.c
+++ b/bin/varnishtest/vtc_main.c
@@ -165,7 +165,7 @@ tst_cb(const struct vev *ve, int what)
 	// printf("CB %p %s %d\n", ve, jp->tst->filename, what);
 	if (what == 0) {
 		jp->killed = 1;
-		AZ(kill(jp->child, SIGKILL)); /* XXX: Timeout */
+		AZ(kill(-jp->child, SIGKILL)); /* XXX: Timeout */
 	} else {
 		assert(what & (EV_RD | EV_HUP));
 	}
@@ -298,6 +298,7 @@ start_test(void)
 	jp->child = fork();
 	assert(jp->child >= 0);
 	if (jp->child == 0) {
+		AZ(setpgrp(getpid(), 0));
 		VFIL_null_fd(STDIN_FILENO);
 		assert(dup2(p[1], STDOUT_FILENO) == STDOUT_FILENO);
 		assert(dup2(p[1], STDERR_FILENO) == STDERR_FILENO);

From phk at FreeBSD.org  Wed Nov  8 13:04:05 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Wed,  8 Nov 2017 13:04:05 +0000 (UTC)
Subject: [master] 9887efe Spell setpgrp() as setpgid() instead.
Message-ID: <20171108130405.1ED0662AED@lists.varnish-cache.org>


commit 9887efe5c899f6af4d71e1352b228752a9aa4531
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Nov 8 13:02:59 2017 +0000

    Spell setpgrp() as setpgid() instead.

diff --git a/bin/varnishtest/vtc_main.c b/bin/varnishtest/vtc_main.c
index 4df1af0..96ebaec 100644
--- a/bin/varnishtest/vtc_main.c
+++ b/bin/varnishtest/vtc_main.c
@@ -298,7 +298,7 @@ start_test(void)
 	jp->child = fork();
 	assert(jp->child >= 0);
 	if (jp->child == 0) {
-		AZ(setpgrp(getpid(), 0));
+		AZ(setpgid(getpid(), 0));
 		VFIL_null_fd(STDIN_FILENO);
 		assert(dup2(p[1], STDOUT_FILENO) == STDOUT_FILENO);
 		assert(dup2(p[1], STDERR_FILENO) == STDERR_FILENO);

From nils.goroll at uplex.de  Wed Nov  8 15:41:06 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Wed,  8 Nov 2017 15:41:06 +0000 (UTC)
Subject: [master] 128cc1a document struct exp_priv ownership
Message-ID: <20171108154106.29A7962083@lists.varnish-cache.org>


commit 128cc1a5086af89117840c08ea002e54ade1a061
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Wed Nov 8 16:19:38 2017 +0100

    document struct exp_priv ownership

diff --git a/bin/varnishd/cache/cache_expire.c b/bin/varnishd/cache/cache_expire.c
index fc6e9b9..7bbd123 100644
--- a/bin/varnishd/cache/cache_expire.c
+++ b/bin/varnishd/cache/cache_expire.c
@@ -43,14 +43,15 @@
 struct exp_priv {
 	unsigned			magic;
 #define EXP_PRIV_MAGIC			0x9db22482
+	/* shared */
 	struct lock			mtx;
+	VSTAILQ_HEAD(,objcore)		inbox;
+	pthread_cond_t			condvar;
 
+	/* owned by exp thread */
 	struct worker			*wrk;
 	struct vsl_log			vsl;
-
-	VSTAILQ_HEAD(,objcore)		inbox;
 	struct binheap			*heap;
-	pthread_cond_t			condvar;
 };
 
 static struct exp_priv *exphdl;

From nils.goroll at uplex.de  Thu Nov  9 13:15:10 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Thu,  9 Nov 2017 13:15:10 +0000 (UTC)
Subject: [master] aa8875a add a temporary bandaid for vmod_re
Message-ID: <20171109131510.B5FC1624A3@lists.varnish-cache.org>


commit aa8875a44d587bc5530554963f93fffba99efadd
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Thu Nov 9 14:11:05 2017 +0100

    add a temporary bandaid for vmod_re
    
    @bsdphk to be discussed / replaced

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index 250b0e5..e920268 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -731,6 +731,7 @@ extern const char H__Reason[];
 #define VXID(u) ((u) & VSL_IDENTMASK)
 uint32_t VXID_Get(struct worker *, uint32_t marker);
 extern volatile struct params * cache_param;
+extern volatile struct vre_limits *vparam_vre_limits;
 extern pthread_key_t witness_key;
 
 /* cache_lck.c */
diff --git a/bin/varnishd/cache/cache_main.c b/bin/varnishd/cache/cache_main.c
index cfaec23..239c095 100644
--- a/bin/varnishd/cache/cache_main.c
+++ b/bin/varnishd/cache/cache_main.c
@@ -49,7 +49,9 @@
 #include "hash/hash_slinger.h"
 
 
-volatile struct params	*cache_param;
+volatile struct params		*cache_param;
+// XXX generic solution?
+volatile struct vre_limits	*vparam_vre_limits;
 
 /*--------------------------------------------------------------------
  * Per thread storage for the session currently being processed by
@@ -308,6 +310,8 @@ child_main(int sigmagic, size_t altstksz)
 #endif
 
 	cache_param = heritage.param;
+	// XXX TODO - generic solution?
+	vparam_vre_limits = &cache_param->vre_limits;
 
 	AZ(pthread_key_create(&req_key, NULL));
 	AZ(pthread_key_create(&bo_key, NULL));

From nils.goroll at uplex.de  Thu Nov  9 13:48:06 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Thu,  9 Nov 2017 13:48:06 +0000 (UTC)
Subject: [master] 52d7781 mark another cache_param issue
Message-ID: <20171109134806.BAC1362083@lists.varnish-cache.org>


commit 52d77816664d76d79e32531bc818ff6f9937d32b
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Thu Nov 9 14:46:53 2017 +0100

    mark another cache_param issue

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index e920268..29a6923 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -989,6 +989,10 @@ Tlen(const txt t)
  */
 #define W_TIM_real(w) ((w)->lastused = VTIM_real())
 
+/*
+ * XXX should cache.h refer to cache_param if common_param.h
+ * is not in $DIST ?
+ */
 #define FEATURE(x)	COM_FEATURE(cache_param->feature_bits, x)
 #define DO_DEBUG(x)	COM_DO_DEBUG(cache_param->debug_bits, x)
 

From phk at FreeBSD.org  Thu Nov  9 18:41:07 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Thu,  9 Nov 2017 18:41:07 +0000 (UTC)
Subject: [master] 0f248ea Don't recurse into cleanup
Message-ID: <20171109184107.6A2C4624A4@lists.varnish-cache.org>


commit 0f248ea50ac9e173a8c221bb14b19456d8bed704
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Nov 9 09:24:58 2017 +0000

    Don't recurse into cleanup

diff --git a/bin/varnishtest/vtc.c b/bin/varnishtest/vtc.c
index d610421..950b003 100644
--- a/bin/varnishtest/vtc.c
+++ b/bin/varnishtest/vtc.c
@@ -813,7 +813,12 @@ int
 fail_out(void)
 {
 	unsigned old_err;
+	static int once = 0;
 
+	if (once++) {
+		vtc_log(vltop, 1, "failure during reset");
+		return(vtc_error);
+	}
 	old_err = vtc_error;
 	if (!vtc_stop)
 		vtc_stop = 1;

From phk at FreeBSD.org  Thu Nov  9 18:41:07 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Thu,  9 Nov 2017 18:41:07 +0000 (UTC)
Subject: [master] a04c309 Test the "quit" CLI command
Message-ID: <20171109184107.80894624A6@lists.varnish-cache.org>


commit a04c309263f1aebd1dabe94536f38652606b5bac
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Nov 9 09:30:42 2017 +0000

    Test the "quit" CLI command

diff --git a/bin/varnishtest/tests/a00017.vtc b/bin/varnishtest/tests/a00017.vtc
index 1a3538b..e1bce88 100644
--- a/bin/varnishtest/tests/a00017.vtc
+++ b/bin/varnishtest/tests/a00017.vtc
@@ -27,6 +27,10 @@ shell {varnishadm -n ${tmpdir}/v1 start}
 
 shell {varnishadm -n ${tmpdir}/v1 debug.listen_address}
 
+shell -exit 1 -expect "Command failed with error code 500" {
+	varnishadm -n ${tmpdir}/v1 quit
+}
+
 process p1 -stop -wait
 
 # Test multiple -f options

From phk at FreeBSD.org  Thu Nov  9 18:41:07 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Thu,  9 Nov 2017 18:41:07 +0000 (UTC)
Subject: [master] b802da8 Responses limited by ${cli_limit} are OK.
Message-ID: <20171109184107.9AAC8624A9@lists.varnish-cache.org>


commit b802da87dbd14038c620cf8f1fa742dce9026a96
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Nov 9 09:43:21 2017 +0000

    Responses limited by ${cli_limit} are OK.

diff --git a/bin/varnishadm/varnishadm.c b/bin/varnishadm/varnishadm.c
index aa3bf6d..6d76761 100644
--- a/bin/varnishadm/varnishadm.c
+++ b/bin/varnishadm/varnishadm.c
@@ -132,7 +132,7 @@ cli_sock(const char *T_arg, const char *S_arg)
 		cli_write(sock, "\n");
 		(void)VCLI_ReadResult(sock, &status, &answer, timeout);
 	}
-	if (status != CLIS_OK) {
+	if (status != CLIS_OK && status != CLIS_TRUNCATED) {
 		fprintf(stderr, "Rejected %u\n%s\n", status, answer);
 		closefd(&sock);
 		free(answer);
@@ -174,9 +174,8 @@ do_args(int sock, int argc, char * const *argv)
 	(void)close(sock);
 
 	printf("%s\n", answer);
-	if (status == CLIS_OK) {
+	if (status == CLIS_OK || status == CLIS_TRUNCATED)
 		exit(0);
-	}
 	fprintf(stderr, "Command failed with error code %u\n", status);
 	exit(1);
 }

From phk at FreeBSD.org  Thu Nov  9 18:41:07 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Thu,  9 Nov 2017 18:41:07 +0000 (UTC)
Subject: [master] b7060de Test more obscure CLI corners
Message-ID: <20171109184107.B2E83624B1@lists.varnish-cache.org>


commit b7060dedfdd5a77c5b8d8bcfa2069062ae19ce90
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Nov 9 09:46:53 2017 +0000

    Test more obscure CLI corners

diff --git a/bin/varnishtest/tests/a00017.vtc b/bin/varnishtest/tests/a00017.vtc
index e1bce88..b700305 100644
--- a/bin/varnishtest/tests/a00017.vtc
+++ b/bin/varnishtest/tests/a00017.vtc
@@ -31,6 +31,17 @@ shell -exit 1 -expect "Command failed with error code 500" {
 	varnishadm -n ${tmpdir}/v1 quit
 }
 
+shell -exit 1 -expect "Command failed with error code 102" {
+	varnishadm -n ${tmpdir}/v1 debug.panic.master -j
+}
+
+shell -exit 1 -expect "Command failed with error code 101" {
+	varnishadm -n ${tmpdir}/v1 123
+}
+
+shell "varnishadm -n ${tmpdir}/v1 param.set cli_limit 128"
+shell -expect "[response was truncated]" "varnishadm -n ${tmpdir}/v1 help"
+
 process p1 -stop -wait
 
 # Test multiple -f options

From daghf at varnish-software.com  Fri Nov 10 13:26:07 2017
From: daghf at varnish-software.com (Dag Haavi Finstad)
Date: Fri, 10 Nov 2017 13:26:07 +0000 (UTC)
Subject: [master] 28ab2b8 Assert that an h2 stream is not scheduled on cleanup
Message-ID: <20171110132607.3113C62C9F@lists.varnish-cache.org>


commit 28ab2b8ef307c3620883fce446802b0c34c02f3e
Author: Dag Haavi Finstad <daghf at varnish-software.com>
Date:   Fri Nov 10 14:24:31 2017 +0100

    Assert that an h2 stream is not scheduled on cleanup

diff --git a/bin/varnishd/http2/cache_http2_proto.c b/bin/varnishd/http2/cache_http2_proto.c
index 90b4b6d..3ad572b 100644
--- a/bin/varnishd/http2/cache_http2_proto.c
+++ b/bin/varnishd/http2/cache_http2_proto.c
@@ -169,6 +169,7 @@ h2_del_req(struct worker *wrk, const struct h2_req *r2)
 	int r;
 
 	CHECK_OBJ_NOTNULL(r2, H2_REQ_MAGIC);
+	AZ(r2->scheduled);
 	h2 = r2->h2sess;
 	CHECK_OBJ_NOTNULL(h2, H2_SESS_MAGIC);
 	ASSERT_RXTHR(h2);
diff --git a/bin/varnishd/http2/cache_http2_session.c b/bin/varnishd/http2/cache_http2_session.c
index b7e1783..b00395f 100644
--- a/bin/varnishd/http2/cache_http2_session.c
+++ b/bin/varnishd/http2/cache_http2_session.c
@@ -240,6 +240,7 @@ h2_ou_session(struct worker *wrk, struct h2_sess *h2,
 	    sizeof H2_prism);
 	if (hs != HTC_S_COMPLETE) {
 		VSLb(h2->vsl, SLT_Debug, "H2: No/Bad OU PRISM (hs=%d)", hs);
+		r2->scheduled = 0;
 		h2_del_req(wrk, r2);
 		return (0);
 	}

From dridi at varnish-software.com  Fri Nov 10 13:40:08 2017
From: dridi at varnish-software.com (Dridi Boukelmoune)
Date: Fri, 10 Nov 2017 13:40:08 +0000 (UTC)
Subject: [master] ef87c54 Polish
Message-ID: <20171110134008.DCD6F622EA@lists.varnish-cache.org>


commit ef87c54e8ccd9502dd0822ab185cecc1cac539b1
Author: Dridi Boukelmoune <dridi at varnish-software.com>
Date:   Fri Nov 10 14:39:12 2017 +0100

    Polish

diff --git a/bin/varnishtest/tests/m00028.vtc b/bin/varnishtest/tests/m00028.vtc
index 8d6c1a0..3f527a6 100644
--- a/bin/varnishtest/tests/m00028.vtc
+++ b/bin/varnishtest/tests/m00028.vtc
@@ -3,7 +3,7 @@ varnishtest "Test setenv"
 setenv FOO "BAR BAZ"
 
 varnish v1 -vcl {
-	import std from "${topbuild}/lib/libvmod_std/.libs/";
+	import std;
 
 	backend dummy { .host = "${bad_ip}"; .port = "9080"; }
 
@@ -27,7 +27,7 @@ varnish v1 -stop
 setenv -ifunset FOO QUUX
 
 varnish v2 -vcl {
-	import std from "${topbuild}/lib/libvmod_std/.libs/";
+	import std;
 
 	backend dummy { .host = "${bad_ip}"; .port = "9080"; }
 
@@ -51,7 +51,7 @@ varnish v2 -stop
 setenv FOO QUUX
 
 varnish v3 -vcl {
-	import std from "${topbuild}/lib/libvmod_std/.libs/";
+	import std;
 
 	backend dummy { .host = "${bad_ip}"; .port = "9080"; }
 
diff --git a/bin/varnishtest/tests/m00030.vtc b/bin/varnishtest/tests/m00030.vtc
index ff72884..4ea2e0e 100644
--- a/bin/varnishtest/tests/m00030.vtc
+++ b/bin/varnishtest/tests/m00030.vtc
@@ -3,7 +3,7 @@ varnishtest "debug bit vmod_so_keep"
 feature topbuild
 
 varnish v1 -vcl {
-	import std from "${topbuild}/lib/libvmod_std/.libs/";
+	import std;
 	backend b { .host = "${bad_backend}"; }
 } -start
 

From daghf at varnish-software.com  Fri Nov 10 14:11:06 2017
From: daghf at varnish-software.com (Dag Haavi Finstad)
Date: Fri, 10 Nov 2017 14:11:06 +0000 (UTC)
Subject: [master] ad82dbb Formatting
Message-ID: <20171110141106.A258C63020@lists.varnish-cache.org>


commit ad82dbbce519eb496ec672bbb8bb7a08acf0cd42
Author: Dag Haavi Finstad <daghf at varnish-software.com>
Date:   Fri Nov 10 15:08:48 2017 +0100

    Formatting

diff --git a/bin/varnishd/cache/cache_vcl.c b/bin/varnishd/cache/cache_vcl.c
index 203ee18..369ede0 100644
--- a/bin/varnishd/cache/cache_vcl.c
+++ b/bin/varnishd/cache/cache_vcl.c
@@ -523,10 +523,12 @@ VRT_count(VRT_CTX, unsigned u)
 	assert(u < ctx->vcl->conf->nref);
 	if (ctx->vsl != NULL)
 		VSLb(ctx->vsl, SLT_VCL_trace, "%s %u %u.%u.%u",
-		    ctx->vcl->loaded_name, u, ctx->vcl->conf->ref[u].source, ctx->vcl->conf->ref[u].line, ctx->vcl->conf->ref[u].pos);
+		    ctx->vcl->loaded_name, u, ctx->vcl->conf->ref[u].source,
+		    ctx->vcl->conf->ref[u].line, ctx->vcl->conf->ref[u].pos);
 	else
 		VSL(SLT_VCL_trace, 0, "%s %u %u.%u.%u",
-		    ctx->vcl->loaded_name, u, ctx->vcl->conf->ref[u].source, ctx->vcl->conf->ref[u].line, ctx->vcl->conf->ref[u].pos);
+		    ctx->vcl->loaded_name, u, ctx->vcl->conf->ref[u].source,
+		    ctx->vcl->conf->ref[u].line, ctx->vcl->conf->ref[u].pos);
 }
 
 VCL_VCL

From phk at FreeBSD.org  Mon Nov 13 08:53:05 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Mon, 13 Nov 2017 08:53:05 +0000 (UTC)
Subject: [master] 6054d0c Flexelinting
Message-ID: <20171113085305.257F163CE5@lists.varnish-cache.org>


commit 6054d0ccb0af036a371440fd625a938bf22dd324
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Nov 13 08:46:23 2017 +0000

    Flexelinting

diff --git a/bin/varnishtest/flint.lnt b/bin/varnishtest/flint.lnt
index b6b36df..1dc2716 100644
--- a/bin/varnishtest/flint.lnt
+++ b/bin/varnishtest/flint.lnt
@@ -5,6 +5,9 @@
 -function(__assert(1), vtc_dump(2))
 -function(__assert(1), vtc_hexdump(2))
 
+-emacro({779}, ENC)		// String constant in comparison operator '!='
+-emacro({506}, CHKFRAME)	// Constant value Boolean
+
 -esym(850, av)
 
 -esym(534, snprintf)		// Only for varnishtest, and not really nice
diff --git a/bin/varnishtest/vtc_h2_hpack.c b/bin/varnishtest/vtc_h2_hpack.c
index 52f1f1c..f986d2f 100644
--- a/bin/varnishtest/vtc_h2_hpack.c
+++ b/bin/varnishtest/vtc_h2_hpack.c
@@ -65,7 +65,7 @@ huff_decode(char *str, int nm, struct hpk_iter *iter, int ilen)
 		if (pl < tbl->msk) {
 			if (ilen == 0) {
 				if (pl == 0 || (MASK(pack, pl) ==
-						(unsigned)((1 << pl) - 1))) {
+						(unsigned)((1U << pl) - 1U))) {
 					assert(tbl == &byte0);
 					return (l);
 				}
@@ -135,7 +135,7 @@ huff_encode(struct hpk_iter *iter, const char *str, int len)
 	if (pl) {
 		assert(pl < 8);
 		if (iter->buf == iter->end)
-			return (1);
+			return (hpk_done);
 		pl += 8;
 		pack |= (uint64_t)0xff << (64 - pl);
 		*iter->buf = (char)(pack >> 56);
@@ -169,7 +169,7 @@ num_decode(uint32_t *result, struct hpk_iter *iter, uint8_t prefix)
 
 	*result = 0;
 	*result = *iter->buf & (0xff >> (8-prefix));
-	if (*result < (1 << prefix) - 1) {
+	if (*result < (1U << prefix) - 1U) {
 		iter->buf++;
 		return (ITER_DONE(iter));
 	}
@@ -196,9 +196,9 @@ num_encode(struct hpk_iter *iter, uint8_t prefix, uint32_t num)
 	assert(prefix <= 8);
 	assert(iter->buf < iter->end);
 
-	uint8_t pmax = (1 << prefix) - 1;
+	uint8_t pmax = (1U << prefix) - 1U;
 
-	*iter->buf &= 0xff << prefix;
+	*iter->buf &= 0xffU << prefix;
 	if (num <=  pmax) {
 		*iter->buf++ |= num;
 		return (ITER_DONE(iter));
diff --git a/bin/varnishtest/vtc_http2.c b/bin/varnishtest/vtc_http2.c
index e75120f..a779c5a 100644
--- a/bin/varnishtest/vtc_http2.c
+++ b/bin/varnishtest/vtc_http2.c
@@ -124,14 +124,14 @@ clean_headers(struct hpk_hdr *h)
 	}
 }
 
-#define ONLY_CLIENT(hp, av)						\
+#define ONLY_H2_CLIENT(hp, av)						\
 	do {								\
 		if (hp->sfd != NULL)					\
 			vtc_fatal(hp->vl,				\
 			    "\"%s\" only possible in client", av[0]);	\
 	} while (0)
 
-#define ONLY_SERVER(hp, av)						\
+#define ONLY_H2_SERVER(hp, av)						\
 	do {								\
 		if (hp->sfd == NULL)					\
 			vtc_fatal(hp->vl,				\
@@ -252,10 +252,7 @@ readFrameHeader(struct frame *f, const char *buf)
 
 	f->flags = (unsigned char)buf[4];
 
-	f->stid  = (0xff & (unsigned char)buf[5]) << 24;
-	f->stid += (0xff & (unsigned char)buf[6]) << 16;
-	f->stid += (0xff & (unsigned char)buf[7]) <<  8;
-	f->stid += (0xff & (unsigned char)buf[8]);
+	f->stid  = vbe32dec(buf+5);
 }
 
 static void
@@ -271,10 +268,7 @@ writeFrameHeader(char *buf, const struct frame *f)
 
 	buf[4] = f->flags;
 
-	buf[5] = (f->stid >> 24) & 0xff;
-	buf[6] = (f->stid >> 16) & 0xff;
-	buf[7] = (f->stid >>  8) & 0xff;
-	buf[8] = (f->stid      ) & 0xff;
+	vbe32enc(buf + 5, f->stid);
 }
 
 #define INIT_FRAME(f, ty, sz, id, fl) \
@@ -411,12 +405,7 @@ parse_data(struct stream *s, struct frame *f)
 		return;
 	}
 
-	if (s->body) {
-		s->body = realloc(s->body, s->bodylen + size + 1L);
-	} else {
-		AZ(s->bodylen);
-		s->body = malloc(size + 1L);
-	}
+	s->body = realloc(s->body, s->bodylen + size + 1L);
 	AN(s->body);
 	memcpy(s->body + s->bodylen, data, size);
 	s->bodylen += size;
@@ -791,7 +780,7 @@ receive_frame(void *priv)
 					else
 						hdrs = s->resp;
 				}
-				hdrs[0].t = 0;
+				hdrs[0].t = hpk_unset;
 				AZ(vsb);
 				vsb = VSB_new_auto();
 				/*FALLTHROUGH*/
@@ -1395,19 +1384,19 @@ cmd_tx11obj(CMD_ARGS)
 	AN(buf);
 
 	if (!strcmp(cmd_str, "txreq")) {
-		ONLY_CLIENT(s->hp, av);
+		ONLY_H2_CLIENT(s->hp, av);
 		f.type = TYPE_HEADERS;
 		f.flags |= END_STREAM;
 		method_done = 0;
 		path_done = 0;
 		scheme_done = 0;
 	} else if (!strcmp(cmd_str, "txresp")) {
-		ONLY_SERVER(s->hp, av);
+		ONLY_H2_SERVER(s->hp, av);
 		f.type = TYPE_HEADERS;
 		f.flags |= END_STREAM;
 		status_done = 0;
 	} else if (!strcmp(cmd_str, "txpush")) {
-		ONLY_SERVER(s->hp, av);
+		ONLY_H2_SERVER(s->hp, av);
 		f.type = TYPE_PUSH_PROMISE;
 		method_done = 0;
 		path_done = 0;
@@ -2248,9 +2237,9 @@ cmd_rxmsg(CMD_ARGS)
 	CAST_OBJ_NOTNULL(s, priv, STREAM_MAGIC);
 
 	if (!strcmp(av[0], "rxreq"))
-		ONLY_SERVER(s->hp, av);
+		ONLY_H2_SERVER(s->hp, av);
 	else
-		ONLY_CLIENT(s->hp, av);
+		ONLY_H2_CLIENT(s->hp, av);
 
 	f = rxstuff(s);
 	if (!f)
@@ -2392,7 +2381,8 @@ cmd_rxframe(CMD_ARGS)
 	(void)vl;
 	(void)av;
 	CAST_OBJ_NOTNULL(s, priv, STREAM_MAGIC);
-	rxstuff(s);
+	if (rxstuff(s) == NULL)
+		vtc_fatal(s->hp->vl, "No frame received");
 }
 
 static void

From fgsch at lodoss.net  Mon Nov 13 09:10:05 2017
From: fgsch at lodoss.net (Federico G. Schwindt)
Date: Mon, 13 Nov 2017 09:10:05 +0000 (UTC)
Subject: [master] 58eb9a5 Whatever it was, this is OK under OSX now
Message-ID: <20171113091005.5EE9E63264@lists.varnish-cache.org>


commit 58eb9a54344c2944c69a614cb3243631580ed0d1
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Mon Nov 13 08:47:23 2017 +0000

    Whatever it was, this is OK under OSX now

diff --git a/bin/varnishd/cache/cache_lck.c b/bin/varnishd/cache/cache_lck.c
index 05086d9..d9bd7ff 100644
--- a/bin/varnishd/cache/cache_lck.c
+++ b/bin/varnishd/cache/cache_lck.c
@@ -264,9 +264,7 @@ LCK_Init(void)
 {
 
 	AZ(pthread_mutexattr_init(&attr));
-#if !defined(__APPLE__) && !defined(__MACH__)
 	AZ(pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK));
-#endif
 #define LOCK(nam)	lck_##nam = Lck_CreateClass(#nam);
 #include "tbl/locks.h"
 }

From fgsch at lodoss.net  Mon Nov 13 09:10:05 2017
From: fgsch at lodoss.net (Federico G. Schwindt)
Date: Mon, 13 Nov 2017 09:10:05 +0000 (UTC)
Subject: [master] 6b98612 Update
Message-ID: <20171113091005.8376263267@lists.varnish-cache.org>


commit 6b9861205e51609b58310e34a1baaa20f1d0633e
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Mon Nov 13 08:54:30 2017 +0000

    Update

diff --git a/.gitignore b/.gitignore
index efdd279..b534a42 100644
--- a/.gitignore
+++ b/.gitignore
@@ -70,6 +70,8 @@ cscope.*out
 /bin/varnishd/VSC_*.h
 
 # Misc. generated files for included vmods.
+/lib/libvmod_*/VSC_*.c
+/lib/libvmod_*/VSC_*.h
 /lib/libvmod_*/vcc_if.c
 /lib/libvmod_*/vcc_if.h
 /lib/libvmod_*/vmod_*.rst

From fgsch at lodoss.net  Mon Nov 13 09:10:05 2017
From: fgsch at lodoss.net (Federico G. Schwindt)
Date: Mon, 13 Nov 2017 09:10:05 +0000 (UTC)
Subject: [master] 2549e57 Prepare to add a job with TSAN
Message-ID: <20171113091005.B10F66326C@lists.varnish-cache.org>


commit 2549e57c09dc15eae17a4d732e5f633129755e5c
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Mon Nov 13 09:07:43 2017 +0000

    Prepare to add a job with TSAN

diff --git a/.travis.yml b/.travis.yml
index 5bb8d55..fe218bb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,13 +13,13 @@ matrix:
   - os: linux
     dist: trusty
     compiler: clang
-    env: CLANG=5.0
+    env: CLANG=5.0 SAN_FLAGS="--enable-asan --enable-ubsan"
   - os: osx
     osx_image: xcode9
     compiler: clang
   allow_failures:
   - os: osx
-  - env: CLANG=5.0
+  - env: CLANG=5.0 SAN_FLAGS="--enable-asan --enable-ubsan"
 addons:
   apt:
     packages:
@@ -43,10 +43,11 @@ before_install:
       export CONFIGURE_ARGS="--enable-developer-warnings --enable-debugging-symbols --disable-stack-protector --enable-asan --enable-ubsan";
       export ASAN_OPTIONS=abort_on_error=1,detect_odr_violation=1,detect_leaks=1,detect_stack_use_after_return=1,detect_invalid_pointer_pairs=1,handle_segv=0,handle_sigbus=0,use_sigaltstack=0;
       export LSAN_OPTIONS=abort_on_error=1,use_sigaltstack=0,suppressions=$(pwd)/tools/lsan.suppr;
+      export TSAN_OPTIONS=abort_on_error=1,halt_on_error=1,use_sigaltstack=0,suppressions=$(pwd)/tools/tsan.suppr;
       export UBSAN_OPTIONS=halt_on_error=1,print_stacktrace=1,use_sigaltstack=0,suppressions=$(pwd)/tools/ubsan.suppr;
     fi
   - ./autogen.sh
-  - ./configure ${CONFIGURE_ARGS}
+  - ./configure ${CONFIGURE_ARGS} ${SAN_FLAGS}
 script:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
       export PYTHONPATH=`brew --prefix`/lib/python2.7/site-packages; fi
diff --git a/tools/tsan.suppr b/tools/tsan.suppr
new file mode 100644
index 0000000..ff9fac8
--- /dev/null
+++ b/tools/tsan.suppr
@@ -0,0 +1,3 @@
+# varnishtest
+race:cmd_barrier
+race:vtc_log

From fgsch at lodoss.net  Mon Nov 13 09:16:07 2017
From: fgsch at lodoss.net (Federico G. Schwindt)
Date: Mon, 13 Nov 2017 09:16:07 +0000 (UTC)
Subject: [master] ffa342b Enter TSAN
Message-ID: <20171113091607.401D8637A6@lists.varnish-cache.org>


commit ffa342be620040704486c3c49929a19f8b34765a
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Mon Nov 13 09:14:18 2017 +0000

    Enter TSAN
    
    This needs a separate job. Also fix previous commit.

diff --git a/.travis.yml b/.travis.yml
index fe218bb..0d50004 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,12 +14,17 @@ matrix:
     dist: trusty
     compiler: clang
     env: CLANG=5.0 SAN_FLAGS="--enable-asan --enable-ubsan"
+  - os: linux
+    dist: trusty
+    compiler: clang
+    env: CLANG=5.0 SAN_FLAGS="--enable-tsan"
   - os: osx
     osx_image: xcode9
     compiler: clang
   allow_failures:
   - os: osx
   - env: CLANG=5.0 SAN_FLAGS="--enable-asan --enable-ubsan"
+  - env: CLANG=5.0 SAN_FLAGS="--enable-tsan"
 addons:
   apt:
     packages:
@@ -40,14 +45,14 @@ before_install:
       sudo apt-get update;
       sudo apt-get install -y clang-$CLANG llvm-$CLANG;
       export CC=clang-$CLANG;
-      export CONFIGURE_ARGS="--enable-developer-warnings --enable-debugging-symbols --disable-stack-protector --enable-asan --enable-ubsan";
+      export CONFIGURE_ARGS="--enable-developer-warnings --enable-debugging-symbols --disable-stack-protector ${SAN_CLAGS}";
       export ASAN_OPTIONS=abort_on_error=1,detect_odr_violation=1,detect_leaks=1,detect_stack_use_after_return=1,detect_invalid_pointer_pairs=1,handle_segv=0,handle_sigbus=0,use_sigaltstack=0;
       export LSAN_OPTIONS=abort_on_error=1,use_sigaltstack=0,suppressions=$(pwd)/tools/lsan.suppr;
       export TSAN_OPTIONS=abort_on_error=1,halt_on_error=1,use_sigaltstack=0,suppressions=$(pwd)/tools/tsan.suppr;
       export UBSAN_OPTIONS=halt_on_error=1,print_stacktrace=1,use_sigaltstack=0,suppressions=$(pwd)/tools/ubsan.suppr;
     fi
   - ./autogen.sh
-  - ./configure ${CONFIGURE_ARGS} ${SAN_FLAGS}
+  - ./configure ${CONFIGURE_ARGS}
 script:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
       export PYTHONPATH=`brew --prefix`/lib/python2.7/site-packages; fi

From phk at FreeBSD.org  Mon Nov 13 09:18:06 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Mon, 13 Nov 2017 09:18:06 +0000 (UTC)
Subject: [master] 7a9c412 Optimize the trivial string case.
Message-ID: <20171113091806.82BD163969@lists.varnish-cache.org>


commit 7a9c412898fa570a1f3d857490c48ad9f97fa7e0
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Nov 13 09:15:09 2017 +0000

    Optimize the trivial string case.

diff --git a/bin/varnishd/cache/cache_shmlog.c b/bin/varnishd/cache/cache_shmlog.c
index c129fa3..cf72726 100644
--- a/bin/varnishd/cache/cache_shmlog.c
+++ b/bin/varnishd/cache/cache_shmlog.c
@@ -334,6 +334,14 @@ VSLbv(struct vsl_log *vsl, enum VSL_tag_e tag, const char *fmt, va_list ap)
 		return;
 	}
 
+	if (!strcmp(fmt, "%s")) {
+		p = va_arg(ap, char *);
+		t.b = p;
+		t.e = strchr(p, '\0');
+		VSLbt(vsl, tag, t);
+		return;
+	}
+
 	mlen = cache_param->vsl_reclen;
 
 	/* Flush if we cannot fit a full size record */

From phk at FreeBSD.org  Mon Nov 13 09:18:06 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Mon, 13 Nov 2017 09:18:06 +0000 (UTC)
Subject: [master] 8baf4a6 Use VRT_String() instead of VRT_StringList() to
 concentrate pointer gymnastics.
Message-ID: <20171113091806.A36F86396C@lists.varnish-cache.org>


commit 8baf4a690fdb699923dd8438d0088f34fcb24365
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Nov 13 09:16:17 2017 +0000

    Use VRT_String() instead of VRT_StringList() to concentrate pointer gymnastics.
    
    Inspired by: #2488

diff --git a/lib/libvmod_std/vmod_std.c b/lib/libvmod_std/vmod_std.c
index 2887beb..de78793 100644
--- a/lib/libvmod_std/vmod_std.c
+++ b/lib/libvmod_std/vmod_std.c
@@ -135,45 +135,39 @@ vmod_random(VRT_CTX, VCL_REAL lo, VCL_REAL hi)
 }
 
 VCL_VOID __match_proto__(td_std_log)
-vmod_log(VRT_CTX, const char *s, ...)
+vmod_log(VRT_CTX, const char *fmt, ...)
 {
-	txt t;
-	unsigned u;
+	const char *p;
 	va_list ap;
+	uintptr_t sn;
 
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
-	u = WS_Reserve(ctx->ws, 0);
-	t.b = ctx->ws->f;
-	va_start(ap, s);
-	t.e = VRT_StringList(ctx->ws->f, u, s, ap);
+	sn = WS_Snapshot(ctx->ws);
+	va_start(ap, fmt);
+	p = VRT_String(ctx->ws, NULL, fmt, ap);
 	va_end(ap);
-	if (t.e != NULL) {
-		assert(t.e > t.b);
-		t.e--;
-		if (ctx->vsl != NULL)
-			VSLbt(ctx->vsl, SLT_VCL_Log, t);
-		else
-			VSL(SLT_VCL_Log, 0, "%s", t.b);
-	}
-	WS_Release(ctx->ws, 0);
+	if (p != NULL && ctx->vsl != NULL)
+		VSLb(ctx->vsl, SLT_VCL_Log, "%s", p);
+	else if (p != NULL)
+		VSL(SLT_VCL_Log, 0, "%s", p);
+	WS_Reset(ctx->ws, sn);
 }
 
 VCL_VOID __match_proto__(td_std_syslog)
 vmod_syslog(VRT_CTX, VCL_INT fac, const char *fmt, ...)
 {
-	unsigned u;
+	const char *p;
 	va_list ap;
-	txt t;
+	uintptr_t sn;
 
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
-	u = WS_Reserve(ctx->ws, 0);
-	t.b = ctx->ws->f;
+	sn = WS_Snapshot(ctx->ws);
 	va_start(ap, fmt);
-	t.e = VRT_StringList(ctx->ws->f, u, fmt, ap);
+	p = VRT_String(ctx->ws, NULL, fmt, ap);
 	va_end(ap);
-	if (t.e != NULL)
-		syslog((int)fac, "%s", t.b);
-	WS_Release(ctx->ws, 0);
+	if (p != NULL)
+		syslog((int)fac, "%s", p);
+	WS_Reset(ctx->ws, sn);
 }
 
 VCL_BOOL __match_proto__(td_std_file_exists)

From fgsch at lodoss.net  Mon Nov 13 09:34:06 2017
From: fgsch at lodoss.net (Federico G. Schwindt)
Date: Mon, 13 Nov 2017 09:34:06 +0000 (UTC)
Subject: [master] eddb4a7 Typo
Message-ID: <20171113093406.EA4206302A@lists.varnish-cache.org>


commit eddb4a7a75344826c1e6516059ec61e9aaa46983
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Mon Nov 13 09:33:08 2017 +0000

    Typo

diff --git a/.travis.yml b/.travis.yml
index 0d50004..78ffad5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -45,7 +45,7 @@ before_install:
       sudo apt-get update;
       sudo apt-get install -y clang-$CLANG llvm-$CLANG;
       export CC=clang-$CLANG;
-      export CONFIGURE_ARGS="--enable-developer-warnings --enable-debugging-symbols --disable-stack-protector ${SAN_CLAGS}";
+      export CONFIGURE_ARGS="--enable-developer-warnings --enable-debugging-symbols --disable-stack-protector ${SAN_FLAGS}";
       export ASAN_OPTIONS=abort_on_error=1,detect_odr_violation=1,detect_leaks=1,detect_stack_use_after_return=1,detect_invalid_pointer_pairs=1,handle_segv=0,handle_sigbus=0,use_sigaltstack=0;
       export LSAN_OPTIONS=abort_on_error=1,use_sigaltstack=0,suppressions=$(pwd)/tools/lsan.suppr;
       export TSAN_OPTIONS=abort_on_error=1,halt_on_error=1,use_sigaltstack=0,suppressions=$(pwd)/tools/tsan.suppr;

From nils.goroll at uplex.de  Mon Nov 13 11:10:10 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Mon, 13 Nov 2017 11:10:10 +0000 (UTC)
Subject: [master] cab6b13 drop a note white trying to grok the code
Message-ID: <20171113111010.DFCEB63D5C@lists.varnish-cache.org>


commit cab6b1383e723a3266aad487d6122fe914700a70
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Mon Nov 13 11:51:37 2017 +0100

    drop a note white trying to grok the code

diff --git a/bin/varnishd/cache/cache_acceptor.c b/bin/varnishd/cache/cache_acceptor.c
index 523bba9..21b8b0a 100644
--- a/bin/varnishd/cache/cache_acceptor.c
+++ b/bin/varnishd/cache/cache_acceptor.c
@@ -524,6 +524,8 @@ vca_acct(void *arg)
 	struct listen_sock *ls;
 	double t0, now;
 
+	// XXX Actually a mis-nomer now because the accept happens in a pool
+	// thread. Rename to accept-nanny or so?
 	THR_SetName("cache-acceptor");
 	THR_Init();
 	(void)arg;

From nils.goroll at uplex.de  Mon Nov 13 11:19:04 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Mon, 13 Nov 2017 11:19:04 +0000 (UTC)
Subject: [master] 9701bc5 mark workspace overflows where some WS_Reserve() was
 insufficient
Message-ID: <20171113111904.923AF63123@lists.varnish-cache.org>


commit 9701bc56d863c74f0181e090a7f045a13d13fb27
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Mon Nov 13 08:20:13 2017 +0100

    mark workspace overflows where some WS_Reserve() was insufficient

diff --git a/bin/varnishd/cache/cache_http.c b/bin/varnishd/cache/cache_http.c
index 36bf2b3..8797c92 100644
--- a/bin/varnishd/cache/cache_http.c
+++ b/bin/varnishd/cache/cache_http.c
@@ -379,6 +379,7 @@ http_CollectHdrSep(struct http *hp, const char *hdr, const char *sep)
 			if (b + x >= e) {
 				http_fail(hp);
 				VSLb(hp->vsl, SLT_LostHeader, "%s", hdr + 1);
+				WS_MarkOverflow(hp->ws);
 				WS_Release(hp->ws, 0);
 				return;
 			}
diff --git a/bin/varnishd/cache/cache_vrt.c b/bin/varnishd/cache/cache_vrt.c
index b975485..0d3b19e 100644
--- a/bin/varnishd/cache/cache_vrt.c
+++ b/bin/varnishd/cache/cache_vrt.c
@@ -207,6 +207,10 @@ VRT_String(struct ws *ws, const char *h, const char *p, va_list ap)
 	}
 	b = VRT_StringList(b, e > b ? e - b : 0, p, ap);
 	if (b == NULL || b == e) {
+		/*
+		 * NO WS_MarkOverflow here because the caller might have a
+		 * fallback
+		 */
 		WS_Release(ws, 0);
 		return (NULL);
 	}
diff --git a/lib/libvmod_std/vmod_std.c b/lib/libvmod_std/vmod_std.c
index de78793..afc1f0a 100644
--- a/lib/libvmod_std/vmod_std.c
+++ b/lib/libvmod_std/vmod_std.c
@@ -86,6 +86,7 @@ vmod_updown(VRT_CTX, int up, const char *s, va_list ap)
 		*b = '\0';
 	b++;
 	if (b > e) {
+		WS_MarkOverflow(ctx->ws);
 		WS_Release(ctx->ws, 0);
 		return (NULL);
 	} else {
@@ -146,9 +147,17 @@ vmod_log(VRT_CTX, const char *fmt, ...)
 	va_start(ap, fmt);
 	p = VRT_String(ctx->ws, NULL, fmt, ap);
 	va_end(ap);
-	if (p != NULL && ctx->vsl != NULL)
+
+	if (p == NULL) {
+		WS_MarkOverflow(ctx->ws);
+		WS_Reset(ctx->ws, sn);
+		return;
+	}
+
+	AN(p);
+	if (ctx->vsl != NULL)
 		VSLb(ctx->vsl, SLT_VCL_Log, "%s", p);
-	else if (p != NULL)
+	else
 		VSL(SLT_VCL_Log, 0, "%s", p);
 	WS_Reset(ctx->ws, sn);
 }
@@ -165,8 +174,15 @@ vmod_syslog(VRT_CTX, VCL_INT fac, const char *fmt, ...)
 	va_start(ap, fmt);
 	p = VRT_String(ctx->ws, NULL, fmt, ap);
 	va_end(ap);
-	if (p != NULL)
-		syslog((int)fac, "%s", p);
+
+	if (p == NULL) {
+		WS_MarkOverflow(ctx->ws);
+		WS_Reset(ctx->ws, sn);
+		return;
+	}
+
+	AN(p);
+	syslog((int)fac, "%s", p);
 	WS_Reset(ctx->ws, sn);
 }
 

From nils.goroll at uplex.de  Mon Nov 13 11:32:05 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Mon, 13 Nov 2017 11:32:05 +0000 (UTC)
Subject: [master] 9c330b6 remove the thread workspace check at the fsm level
Message-ID: <20171113113205.C496663670@lists.varnish-cache.org>


commit 9c330b6dd76f11ddbdab30a2c0b62c45176c47c9
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Fri Nov 10 23:42:15 2017 +0100

    remove the thread workspace check at the fsm level
    
    We still check that nothing is left on the thread workspace after
    vcl methods in vcl_call_method(), but we do not require the thread
    workspace to be totally empty any more.

diff --git a/bin/varnishd/cache/cache_req.c b/bin/varnishd/cache/cache_req.c
index 6ee3050..0688adf 100644
--- a/bin/varnishd/cache/cache_req.c
+++ b/bin/varnishd/cache/cache_req.c
@@ -226,7 +226,6 @@ Req_Cleanup(struct sess *sp, struct worker *wrk, struct req *req)
 	req->is_hit = 0;
 
 	WS_Reset(req->ws, 0);
-	WS_Reset(wrk->aws, 0);
 }
 
 /*----------------------------------------------------------------------
diff --git a/bin/varnishd/cache/cache_req_fsm.c b/bin/varnishd/cache/cache_req_fsm.c
index c593e93..95dafbd 100644
--- a/bin/varnishd/cache/cache_req_fsm.c
+++ b/bin/varnishd/cache/cache_req_fsm.c
@@ -1001,14 +1001,6 @@ CNT_Request(struct worker *wrk, struct req *req)
 		CHECK_OBJ_ORNULL(wrk->nobjhead, OBJHEAD_MAGIC);
 		CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
 
-		/*
-		 * We don't want the thread workspace to be used for
-		 * anything of long duration, so mandate that it be
-		 * empty on state-transitions.
-		 */
-		WS_Assert(wrk->aws);
-		AZ(WS_Snapshot(wrk->aws));
-
 		switch (req->req_step) {
 #define REQ_STEP(l,u,arg) \
 		    case R_STP_##u: \
@@ -1020,7 +1012,6 @@ CNT_Request(struct worker *wrk, struct req *req)
 		default:
 			WRONG("State engine misfire");
 		}
-		WS_Assert(wrk->aws);
 		CHECK_OBJ_ORNULL(wrk->nobjhead, OBJHEAD_MAGIC);
 	}
 	wrk->vsl = NULL;

From nils.goroll at uplex.de  Mon Nov 13 11:32:06 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Mon, 13 Nov 2017 11:32:06 +0000 (UTC)
Subject: [master] beeaa19 take v1l memory from the thread workspace (again)
Message-ID: <20171113113206.0A8BA63674@lists.varnish-cache.org>


commit beeaa19cced3fe1ab79381b2b1b7b0b5594cbb18
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Sun Nov 12 14:47:45 2017 +0100

    take v1l memory from the thread workspace (again)
    
    ... as it was the case before 69d45413bb1fca69cb487b0098f1a7323114fdf7
    and as documented.
    
    The motivation is to remove the reservation from req->ws during
    delivery, but actually line delivery memory should not come from the
    request space - as originally designed:
    
    - We avoid requiring an obscure surplus of workspace_client for delivery
    
      - which is also allocated for every subrequest though not required there
    
    - We get predictable performance as the number of IO-vectors available
      is now only a function of workspace_thread or esi_iovs (see below)
      rather than the amount of memory which happens to be available on
      the request workspace.
    
    As a sensible side effect, we now also fail with an internal 500 error
    for workspace_session and workspace_thread overflows in addition to
    the existing check on workspace_client for completeness.
    
    For ESI requests, we run all of the client side processing, which uses
    the thread workspace, with V1L set up. Thus, V1L now needs its control
    structure together with a small amount of io vectors as an allocation
    on the workspace.
    
    Real world observation has shown that no more than five io vectors are
    normally in use during ESI, yet still we make this number configurable
    and have a default with some safety margin.
    
    For non-ESI requests and headers, we use all of the thread_workspace
    for io vectors, as before.
    
    As V1L does not necessarily reserve workspace any more, functions have
    been renamed to better reflect the purpose:
    
    V1L_Reserve -> V1L_Open
    V1L_FlushRelease -> V1L_Close

diff --git a/bin/varnishd/cache/cache_shmlog.c b/bin/varnishd/cache/cache_shmlog.c
index cf72726..f663bff 100644
--- a/bin/varnishd/cache/cache_shmlog.c
+++ b/bin/varnishd/cache/cache_shmlog.c
@@ -379,7 +379,7 @@ VSLb_ts(struct vsl_log *vsl, const char *event, double first, double *pprev,
 
 	/* XXX: Make an option to turn off some unnecessary timestamp
 	   logging. This must be done carefully because some functions
-	   (e.g. V1L_Reserve) takes the last timestamp as its initial
+	   (e.g. V1L_Open) takes the last timestamp as its initial
 	   value for timeout calculation. */
 	vsl_sanity(vsl);
 	assert(!isnan(now) && now != 0.);
diff --git a/bin/varnishd/http1/cache_http1.h b/bin/varnishd/http1/cache_http1.h
index 8b4c592..ba010db 100644
--- a/bin/varnishd/http1/cache_http1.h
+++ b/bin/varnishd/http1/cache_http1.h
@@ -56,8 +56,8 @@ void V1P_Charge(struct req *, const struct v1p_acct *, struct VSC_vbe *);
 /* cache_http1_line.c */
 void V1L_Chunked(const struct worker *w);
 void V1L_EndChunk(const struct worker *w);
-void V1L_Reserve(struct worker *, struct ws *, int *fd, struct vsl_log *,
-    double t0);
+void V1L_Open(struct worker *, struct ws *, int *fd, struct vsl_log *,
+    double t0, unsigned niov);
 unsigned V1L_Flush(const struct worker *w);
-unsigned V1L_FlushRelease(struct worker *w);
+unsigned V1L_Close(struct worker *w);
 size_t V1L_Write(const struct worker *w, const void *ptr, ssize_t len);
diff --git a/bin/varnishd/http1/cache_http1_deliver.c b/bin/varnishd/http1/cache_http1_deliver.c
index 9bf5bf8..1ccf59d 100644
--- a/bin/varnishd/http1/cache_http1_deliver.c
+++ b/bin/varnishd/http1/cache_http1_deliver.c
@@ -114,31 +114,71 @@ V1D_Deliver(struct req *req, struct boc *boc, int sendbody)
 	} else if (!http_GetHdr(req->resp, H_Connection, NULL))
 		http_SetHeader(req->resp, "Connection: keep-alive");
 
-	if (sendbody && req->resp_len != 0)
+	if (WS_Overflowed(req->ws)) {
+		v1d_error(req, "workspace_client overflow");
+		return;
+	}
+
+	if (WS_Overflowed(req->sp->ws)) {
+		v1d_error(req, "workspace_session overflow");
+		return;
+	}
+
+	if (req->resp_len == 0)
+		sendbody = 0;
+
+	if (sendbody)
 		VDP_push(req, &v1d_vdp, NULL, 1);
 
 	AZ(req->wrk->v1l);
-	V1L_Reserve(req->wrk, req->ws, &req->sp->fd, req->vsl, req->t_prev);
+	V1L_Open(req->wrk, req->wrk->aws,
+		 &req->sp->fd, req->vsl, req->t_prev, 0);
 
-	if (WS_Overflowed(req->ws)) {
-		v1d_error(req, "workspace_client overflow");
+	if (WS_Overflowed(req->wrk->aws)) {
+		v1d_error(req, "workspace_thread overflow");
 		AZ(req->wrk->v1l);
 		return;
 	}
 
 	req->acct.resp_hdrbytes += HTTP1_Write(req->wrk, req->resp, HTTP1_Resp);
+
 	if (DO_DEBUG(DBG_FLUSH_HEAD))
 		(void)V1L_Flush(req->wrk);
 
-	if (sendbody && req->resp_len != 0) {
-		if (req->res_mode & RES_CHUNKED)
-			V1L_Chunked(req->wrk);
-		err = VDP_DeliverObj(req);
-		if (!err && (req->res_mode & RES_CHUNKED))
-			V1L_EndChunk(req->wrk);
+	if (! sendbody || req->res_mode & RES_ESI)
+		if (V1L_Close(req->wrk) && req->sp->fd >= 0) {
+			Req_Fail(req, SC_REM_CLOSE);
+			sendbody = 0;
+		}
+
+	if (! sendbody) {
+		AZ(req->wrk->v1l);
+		VDP_close(req);
+		return;
 	}
 
-	if ((V1L_FlushRelease(req->wrk) || err) && req->sp->fd >= 0)
+	AN(sendbody);
+	if (req->res_mode & RES_ESI) {
+		AZ(req->wrk->v1l);
+
+		V1L_Open(req->wrk, req->wrk->aws,
+			 &req->sp->fd, req->vsl, req->t_prev,
+			 cache_param->esi_iovs);
+
+		if (WS_Overflowed(req->wrk->aws)) {
+			v1d_error(req, "workspace_thread overflow");
+			AZ(req->wrk->v1l);
+			return;
+		}
+	}
+
+	if (req->res_mode & RES_CHUNKED)
+		V1L_Chunked(req->wrk);
+	err = VDP_DeliverObj(req);
+	if (!err && (req->res_mode & RES_CHUNKED))
+		V1L_EndChunk(req->wrk);
+
+	if ((V1L_Close(req->wrk) || err) && req->sp->fd >= 0)
 		Req_Fail(req, SC_REM_CLOSE);
 	AZ(req->wrk->v1l);
 	VDP_close(req);
diff --git a/bin/varnishd/http1/cache_http1_fetch.c b/bin/varnishd/http1/cache_http1_fetch.c
index 9efb938..81acbda 100644
--- a/bin/varnishd/http1/cache_http1_fetch.c
+++ b/bin/varnishd/http1/cache_http1_fetch.c
@@ -99,7 +99,7 @@ V1F_SendReq(struct worker *wrk, struct busyobj *bo, uint64_t *ctr,
 	VSLb(bo->vsl, SLT_BackendStart, "%s %s", abuf, pbuf);
 
 	(void)VTCP_blocking(*htc->rfd);	/* XXX: we should timeout instead */
-	V1L_Reserve(wrk, wrk->aws, htc->rfd, bo->vsl, bo->t_prev);
+	V1L_Open(wrk, wrk->aws, htc->rfd, bo->vsl, bo->t_prev, 0);
 	*ctr += HTTP1_Write(wrk, hp, HTTP1_Req);
 
 	/* Deal with any message-body the request might (still) have */
@@ -122,7 +122,7 @@ V1F_SendReq(struct worker *wrk, struct busyobj *bo, uint64_t *ctr,
 			V1L_EndChunk(wrk);
 	}
 
-	j = V1L_FlushRelease(wrk);
+	j = V1L_Close(wrk);
 	if (j != 0 || i < 0) {
 		VSLb(bo->vsl, SLT_FetchError, "backend write error: %d (%s)",
 		    errno, strerror(errno));
diff --git a/bin/varnishd/http1/cache_http1_line.c b/bin/varnishd/http1/cache_http1_line.c
index cb86c83..2ab0712 100644
--- a/bin/varnishd/http1/cache_http1_line.c
+++ b/bin/varnishd/http1/cache_http1_line.c
@@ -69,11 +69,13 @@ struct v1l {
 };
 
 /*--------------------------------------------------------------------
+ * for niov == 0, reserve the ws for max number of iovs
+ * otherwise, up to niov
  */
 
 void
-V1L_Reserve(struct worker *wrk, struct ws *ws, int *fd, struct vsl_log *vsl,
-    double t0)
+V1L_Open(struct worker *wrk, struct ws *ws, int *fd, struct vsl_log *vsl,
+    double t0, unsigned niov)
 {
 	struct v1l *v1l;
 	unsigned u;
@@ -84,7 +86,12 @@ V1L_Reserve(struct worker *wrk, struct ws *ws, int *fd, struct vsl_log *vsl,
 
 	if (WS_Overflowed(ws))
 		return;
+
+	if (niov != 0)
+		assert(niov >= 3);
+
 	res = WS_Snapshot(ws);
+
 	v1l = WS_Alloc(ws, sizeof *v1l);
 	if (v1l == NULL)
 		return;
@@ -102,6 +109,8 @@ V1L_Reserve(struct worker *wrk, struct ws *ws, int *fd, struct vsl_log *vsl,
 	}
 	if (u > IOV_MAX)
 		u = IOV_MAX;
+	if (niov != 0 && u > niov)
+		u = niov;
 	v1l->iov = (void*)ws->f;
 	v1l->siov = u;
 	v1l->ciov = u;
@@ -112,10 +121,13 @@ V1L_Reserve(struct worker *wrk, struct ws *ws, int *fd, struct vsl_log *vsl,
 	v1l->t0 = t0;
 	v1l->vsl = vsl;
 	wrk->v1l = v1l;
+
+	if (niov != 0)
+		WS_Release(ws, u * sizeof(struct iovec));
 }
 
 unsigned
-V1L_FlushRelease(struct worker *wrk)
+V1L_Close(struct worker *wrk)
 {
 	struct v1l *v1l;
 	unsigned u;
@@ -125,7 +137,8 @@ V1L_FlushRelease(struct worker *wrk)
 	v1l = wrk->v1l;
 	wrk->v1l = NULL;
 	CHECK_OBJ_NOTNULL(v1l, V1L_MAGIC);
-	WS_Release(v1l->ws, 0);
+	if (v1l->ws->r)
+		WS_Release(v1l->ws, 0);
 	WS_Reset(v1l->ws, v1l->res);
 	return (u);
 }
diff --git a/bin/varnishtest/tests/c00071.vtc b/bin/varnishtest/tests/c00071.vtc
index fdeb2f8..734c575 100644
--- a/bin/varnishtest/tests/c00071.vtc
+++ b/bin/varnishtest/tests/c00071.vtc
@@ -18,6 +18,7 @@ varnish v1 -vcl+backend {
 
 		if (req.url ~ "/bar") {
 			set resp.http.x-foo = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+			vtc.workspace_alloc(client, -10);
 		}
 		else if (req.url ~ "/baz") {
 			set resp.http.x-foo = regsub(req.url, "baz", "baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaz");
diff --git a/bin/varnishtest/tests/r02275.vtc b/bin/varnishtest/tests/r02275.vtc
index a705169..812f871 100644
--- a/bin/varnishtest/tests/r02275.vtc
+++ b/bin/varnishtest/tests/r02275.vtc
@@ -1,5 +1,22 @@
 varnishtest "Chunked with no space for iov's on workspace"
 
+# For this test to work with iovecs on the thread workspace (where
+# they belong!), we would need to circumvent the very sensible vrt
+# check that vcl make no permanent reservations on the thread
+# workspace (see vcl_call_method()).
+#
+# One possible way would be to push a VDP just for this.
+#
+# For now, we consider this issue low priority because with v1l living
+# on the thread workspace, the case for hitting #2275 again is as
+# exotic as can be.
+#
+# The values used in this test have been carefully worked out and
+# tested with v1l on the session workspace, so they should work 1:1 on
+# the thread workspace.
+
+feature cmd false
+
 server s1 -repeat 2 {
 	rxreq
 	txresp -nolen -hdr "Transfer-encoding: chunked"
@@ -15,14 +32,19 @@ varnish v1 -vcl+backend {
 	import vtc;
 
 	sub vcl_deliver {
+		# struct v1l is 13 - 15 pointer-sizes,
+		# an iovec should be two pointer-sizes
+		#
+		# we want to hit the case where we got just not
+		# enough space for three iovecs
 		if (req.url == "/1") {
-			vtc.workspace_alloc(client,
-			    -1 * (32 + vtc.typesize("p") * 25));
+			vtc.workspace_alloc(thread,
+			    -1 * vtc.typesize("p") * (13 + 4));
 		} else {
-			vtc.workspace_alloc(client,
-			    -1 * (56 + vtc.typesize("p") * 25));
+			vtc.workspace_alloc(thread,
+			    -1 * vtc.typesize("p") * (15 + 6));
 		}
-		set resp.http.foo = vtc.workspace_free(client);
+		set resp.http.foo = vtc.workspace_free(thread);
 	}
 } -start
 
@@ -36,4 +58,3 @@ client c1 {
 	rxresp
 	expect resp.status == 200
 } -run
-
diff --git a/include/tbl/params.h b/include/tbl/params.h
index 7bf45e9..454021d 100644
--- a/include/tbl/params.h
+++ b/include/tbl/params.h
@@ -458,6 +458,21 @@ PARAM(
 	/* func */	NULL
 )
 
+PARAM(
+	/* name */	esi_iovs,
+	/* typ */	uint,
+	/* min */	"3",
+	/* max */	"1024",	// XXX stringify IOV_MAX
+	/* default */	"10",		// 5 should suffice, add headroom
+	/* units */	"struct iovec",
+	/* flags */	WIZARD,
+	/* s-text */
+	"Number of io vectors to allocate on the thread workspace for "
+	"ESI requests.",
+	/* l-text */	"",
+	/* func */	NULL
+)
+
 #if 0
 /* actual location mgt_param_bits.c*/
 /* See tbl/feature_bits.h */
@@ -1675,9 +1690,12 @@ PARAM(
 	"Bytes of auxiliary workspace per thread.\n"
 	"This workspace is used for certain temporary data structures "
 	"during the operation of a worker thread.\n"
-	"One use is for the io-vectors for writing requests and responses "
-	"to sockets, having too little space will result in more writev(2) "
-	"system calls, having too much just wastes the space.",
+	"One use is for the IO-vectors used during delivery. Setting "
+	"this parameter too low may increase the number of writev() "
+	"syscalls, setting it too high just wastes space.  ~0.1k + "
+	"UIO_MAXIOV * sizeof(struct iovec) (typically = ~16k for 64bit) "
+	"is considered the maximum sensible value under any known "
+	"circumstances (excluding exotic vmod use).",
 	/* l-text */	"",
 	/* func */	NULL
 )

From nils.goroll at uplex.de  Mon Nov 13 11:45:05 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Mon, 13 Nov 2017 11:45:05 +0000 (UTC)
Subject: [master] 2c71cab changelog tlc
Message-ID: <20171113114505.7E44C63D2F@lists.varnish-cache.org>


commit 2c71cabe13e6345f22eb44c047218c147680d6f0
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Mon Nov 13 12:43:43 2017 +0100

    changelog tlc

diff --git a/doc/changes.rst b/doc/changes.rst
index 1fef6c9..0e70047 100644
--- a/doc/changes.rst
+++ b/doc/changes.rst
@@ -16,6 +16,20 @@ Usage
 * The new storage backend type (stevedore) ``default`` now resolves to
   either ``umem`` (where available) or ``malloc``.
 
+* Since varnish 4.1, the thread workspace as configured by
+  ``workspace_thread`` was not used as documented, delivery also used
+  the client workspace.
+
+  We are now taking delivery IO vectors from the thread workspace, so
+  the parameter documemtation is in sync with reality again.
+
+  Users who need to minimize memory footprint might consider
+  decreasing ``workspace_client`` by ``workspace_thread``.
+
+* The new parameter ``esi_iovs`` configures the amount of IO vectors
+  used during ESI delivery. It should not be tuned unless advised by a
+  developer.
+
 VCL
 ---
 

From phk at FreeBSD.org  Mon Nov 13 11:55:05 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Mon, 13 Nov 2017 11:55:05 +0000 (UTC)
Subject: [master] e1e89d5 Document that the counters for locks are not atomic.
Message-ID: <20171113115505.6EB2C63166@lists.varnish-cache.org>


commit e1e89d5ed6f31d1ac049c4b972c331a845525110
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Nov 13 11:40:56 2017 +0000

    Document that the counters for locks are not atomic.

diff --git a/bin/varnishd/VSC_lck.vsc b/bin/varnishd/VSC_lck.vsc
index 75b69be..1a6b6ee 100644
--- a/bin/varnishd/VSC_lck.vsc
+++ b/bin/varnishd/VSC_lck.vsc
@@ -9,6 +9,9 @@
 	Counters which track the activity in the different classes
 	of mutex-locks.
 
+	The counts may be slightly wrong if there are more than one
+	lock instantiated in each class (ie: .creat > 1)
+
 .. varnish_vsc:: creat
 	:type:	counter
 	:level:	debug

From fgsch at lodoss.net  Mon Nov 13 12:27:06 2017
From: fgsch at lodoss.net (Federico G. Schwindt)
Date: Mon, 13 Nov 2017 12:27:06 +0000 (UTC)
Subject: [master] adc4bf3 Disable TSAN for now
Message-ID: <20171113122706.4BC9D63C34@lists.varnish-cache.org>


commit adc4bf34f55c18d82c55336cd0d11d2b58f3b1ae
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Mon Nov 13 12:26:04 2017 +0000

    Disable TSAN for now
    
    It's not ready for primetime yet.

diff --git a/.travis.yml b/.travis.yml
index 78ffad5..3db4182 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,17 +14,12 @@ matrix:
     dist: trusty
     compiler: clang
     env: CLANG=5.0 SAN_FLAGS="--enable-asan --enable-ubsan"
-  - os: linux
-    dist: trusty
-    compiler: clang
-    env: CLANG=5.0 SAN_FLAGS="--enable-tsan"
   - os: osx
     osx_image: xcode9
     compiler: clang
   allow_failures:
   - os: osx
   - env: CLANG=5.0 SAN_FLAGS="--enable-asan --enable-ubsan"
-  - env: CLANG=5.0 SAN_FLAGS="--enable-tsan"
 addons:
   apt:
     packages:

From dridi at varni.sh  Mon Nov 13 12:29:23 2017
From: dridi at varni.sh (Dridi Boukelmoune)
Date: Mon, 13 Nov 2017 13:29:23 +0100
Subject: [master] adc4bf3 Disable TSAN for now
In-Reply-To: <20171113122706.4BC9D63C34@lists.varnish-cache.org>
References: <20171113122706.4BC9D63C34@lists.varnish-cache.org>
Message-ID: <CABoVN9AnJkuQJXak3yXNb1bmvJun-zD8nurLcpudYmUeck=aog@mail.gmail.com>

On Mon, Nov 13, 2017 at 1:27 PM, Federico G. Schwindt <fgsch at lodoss.net> wrote:
>
> commit adc4bf34f55c18d82c55336cd0d11d2b58f3b1ae
> Author: Federico G. Schwindt <fgsch at lodoss.net>
> Date:   Mon Nov 13 12:26:04 2017 +0000
>
>     Disable TSAN for now
>
>     It's not ready for primetime yet.

I looked at it in the context of h2 a while ago, and before we can
test varnishd via the test suite there are many data races in
varnishtest that we need to fix first :(

Dridi

From nils.goroll at uplex.de  Mon Nov 13 13:21:06 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Mon, 13 Nov 2017 13:21:06 +0000 (UTC)
Subject: [master] e53d9e4 std.syslog() should ignore workspace overflows
Message-ID: <20171113132106.419B663E6F@lists.varnish-cache.org>


commit e53d9e4ad3589d9c87aa8755b7b528fcdd416020
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Mon Nov 13 14:13:57 2017 +0100

    std.syslog() should ignore workspace overflows
    
    As dicussed during bugwash.
    
    Ref #2489
    
    partially reverts 9701bc56d863c74f0181e090a7f045a13d13fb27

diff --git a/lib/libvmod_std/vmod.vcc b/lib/libvmod_std/vmod.vcc
index c98eb26..7c2ed1d 100644
--- a/lib/libvmod_std/vmod.vcc
+++ b/lib/libvmod_std/vmod.vcc
@@ -93,6 +93,11 @@ Description
 	Logs the string *s* to syslog tagged with *priority*. *priority*
 	is formed by ORing the facility and level values. See your
 	system's syslog.h file for possible values.
+
+	Notice: Unlike VCL and other functions in the std vmod, this
+	function will not fail VCL processing for workspace overflows:
+	For an out of workspace condition, the ``syslog()`` function
+	has no effect.
 Example
 	std.syslog(9, "Something is wrong");
 
diff --git a/lib/libvmod_std/vmod_std.c b/lib/libvmod_std/vmod_std.c
index afc1f0a..7931dad 100644
--- a/lib/libvmod_std/vmod_std.c
+++ b/lib/libvmod_std/vmod_std.c
@@ -174,15 +174,8 @@ vmod_syslog(VRT_CTX, VCL_INT fac, const char *fmt, ...)
 	va_start(ap, fmt);
 	p = VRT_String(ctx->ws, NULL, fmt, ap);
 	va_end(ap);
-
-	if (p == NULL) {
-		WS_MarkOverflow(ctx->ws);
-		WS_Reset(ctx->ws, sn);
-		return;
-	}
-
-	AN(p);
-	syslog((int)fac, "%s", p);
+	if (p != NULL)
+		syslog((int)fac, "%s", p);
 	WS_Reset(ctx->ws, sn);
 }
 

From nils.goroll at uplex.de  Mon Nov 13 13:24:07 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Mon, 13 Nov 2017 13:24:07 +0000 (UTC)
Subject: [master] e2f63d8 I had promised to drop an XXX
Message-ID: <20171113132407.6AF7E63065@lists.varnish-cache.org>


commit e2f63d8716afd5e8d7e16e1d2fdac0820b262d28
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Mon Nov 13 14:23:10 2017 +0100

    I had promised to drop an XXX

diff --git a/lib/libvmod_std/vmod_std.c b/lib/libvmod_std/vmod_std.c
index 7931dad..f4536ec 100644
--- a/lib/libvmod_std/vmod_std.c
+++ b/lib/libvmod_std/vmod_std.c
@@ -162,6 +162,7 @@ vmod_log(VRT_CTX, const char *fmt, ...)
 	WS_Reset(ctx->ws, sn);
 }
 
+/* XXX use vsyslog() ? */
 VCL_VOID __match_proto__(td_std_syslog)
 vmod_syslog(VRT_CTX, VCL_INT fac, const char *fmt, ...)
 {

From nils.goroll at uplex.de  Mon Nov 13 13:54:05 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Mon, 13 Nov 2017 13:54:05 +0000 (UTC)
Subject: [master] a9c87f5 retry MAC_reopen_sockets() during child stop
Message-ID: <20171113135405.3D22C63B04@lists.varnish-cache.org>


commit a9c87f553cf48026e4b6ade79cbb6b21985d85d3
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Mon Nov 13 14:52:18 2017 +0100

    retry MAC_reopen_sockets() during child stop
    
    Let's see if this fixes #2482

diff --git a/bin/varnishd/mgt/mgt.h b/bin/varnishd/mgt/mgt.h
index 87f1d92..92a6f6d 100644
--- a/bin/varnishd/mgt/mgt.h
+++ b/bin/varnishd/mgt/mgt.h
@@ -65,7 +65,7 @@ extern const char * const builtin_vcl;
 /* mgt_acceptor.c */
 
 void MAC_Arg(const char *);
-void MAC_reopen_sockets(void);
+int MAC_reopen_sockets(void);
 
 /* mgt_child.c */
 void MCH_Init(void);
diff --git a/bin/varnishd/mgt/mgt_acceptor.c b/bin/varnishd/mgt/mgt_acceptor.c
index 695e882..e834786 100644
--- a/bin/varnishd/mgt/mgt_acceptor.c
+++ b/bin/varnishd/mgt/mgt_acceptor.c
@@ -73,24 +73,28 @@ mac_opensocket(struct listen_sock *ls)
 
 /*=====================================================================
  * Reopen the accept sockets to get rid of listen status.
+ * returns the highest errno encountered, 0 for success
  */
 
-void
+int
 MAC_reopen_sockets(void)
 {
 	struct listen_sock *ls;
-	int fail;
+	int err, fail = 0;
 
 	VTAILQ_FOREACH(ls, &heritage.socks, list) {
 		VJ_master(JAIL_MASTER_PRIVPORT);
-		fail = mac_opensocket(ls);
+		err = mac_opensocket(ls);
 		VJ_master(JAIL_MASTER_LOW);
-		if (fail == 0)
+		if (err == 0)
 			continue;
+		if (err > fail)
+			fail = err;
 		MGT_Complain(C_ERR,
 		    "Could not reopen listen socket %s: %s",
-		    ls->endpoint, strerror(fail));
+		    ls->endpoint, strerror(err));
 	}
+	return fail;
 }
 
 /*--------------------------------------------------------------------*/
diff --git a/bin/varnishd/mgt/mgt_child.c b/bin/varnishd/mgt/mgt_child.c
index 0c2eb11..6121ed2 100644
--- a/bin/varnishd/mgt/mgt_child.c
+++ b/bin/varnishd/mgt/mgt_child.c
@@ -473,7 +473,16 @@ mgt_reap_child(void)
 		fprintf(stderr, "WAIT 0x%jd\n", (intmax_t)r);
 	assert(r == child_pid);
 
-	MAC_reopen_sockets();
+	/*
+	 * XXX exit mgr if we fail even with retries?
+	 * number of retries? interval?
+	 */
+	for (i = 0; i < 3; i++) {
+		if (MAC_reopen_sockets() == 0)
+			break;
+		/* error already logged */
+		(void)sleep(1);
+	}
 
 	VSB_printf(vsb, "Child (%jd) %s", (intmax_t)r,
 	    status ? "died" : "ended");

From nils.goroll at uplex.de  Mon Nov 13 14:22:06 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Mon, 13 Nov 2017 14:22:06 +0000 (UTC)
Subject: [master] d7cd7a9 fix v71.vtc again for systems with smaller pointers
Message-ID: <20171113142206.74A8263597@lists.varnish-cache.org>


commit d7cd7a9012d3f35f0d4bc24e69a0dcf8f7020a16
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Mon Nov 13 15:06:10 2017 +0100

    fix v71.vtc again for systems with smaller pointers
    
    beeaa19cced3fe1ab79381b2b1b7b0b5594cbb18 had left 32 bytes on the client
    workspace for the /baz case, which was sufficient to write resp.http.x-of
    for 4-byte alignment, but not 8byte alignment:
    
    * "false\0"		=  6b
    * "x-of: false\0"	= 12b

diff --git a/bin/varnishtest/tests/c00071.vtc b/bin/varnishtest/tests/c00071.vtc
index 734c575..c0ebbc2 100644
--- a/bin/varnishtest/tests/c00071.vtc
+++ b/bin/varnishtest/tests/c00071.vtc
@@ -21,7 +21,7 @@ varnish v1 -vcl+backend {
 			vtc.workspace_alloc(client, -10);
 		}
 		else if (req.url ~ "/baz") {
-			set resp.http.x-foo = regsub(req.url, "baz", "baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaz");
+			set resp.http.x-foo = regsub(req.url, "baz", "baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaz");
 		}
 		set resp.http.x-of = vtc.workspace_overflowed(client);
 	}

From nils.goroll at uplex.de  Mon Nov 13 16:31:05 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Mon, 13 Nov 2017 16:31:05 +0000 (UTC)
Subject: [master] ed70902 sync comment with reality
Message-ID: <20171113163105.BF73363F81@lists.varnish-cache.org>


commit ed70902076c7a552685b3e4ab0b11bf327c2c371
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Mon Nov 13 17:30:28 2017 +0100

    sync comment with reality

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index 29a6923..14ba352 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -406,7 +406,7 @@ struct busyobj {
 	char			*end;
 
 	/*
-	 * All fields from refcount and down are zeroed when the busyobj
+	 * All fields from retries and down are zeroed when the busyobj
 	 * is recycled.
 	 */
 	int			retries;

From phk at FreeBSD.org  Mon Nov 13 20:53:08 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Mon, 13 Nov 2017 20:53:08 +0000 (UTC)
Subject: [master] f2fc04a Remove superfluous initialization.
Message-ID: <20171113205308.CB4CE63F7F@lists.varnish-cache.org>


commit f2fc04ac502189d590fb7ac7380af3cf0d08569f
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Nov 13 20:25:32 2017 +0000

    Remove superfluous initialization.

diff --git a/bin/varnishd/http1/cache_http1_deliver.c b/bin/varnishd/http1/cache_http1_deliver.c
index 1ccf59d..99f855d 100644
--- a/bin/varnishd/http1/cache_http1_deliver.c
+++ b/bin/varnishd/http1/cache_http1_deliver.c
@@ -86,7 +86,7 @@ v1d_error(struct req *req, const char *msg)
 void __match_proto__(vtr_deliver_f)
 V1D_Deliver(struct req *req, struct boc *boc, int sendbody)
 {
-	int err = 0;
+	int err;
 
 	CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
 	CHECK_OBJ_ORNULL(boc, BOC_MAGIC);

From phk at FreeBSD.org  Mon Nov 13 20:53:08 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Mon, 13 Nov 2017 20:53:08 +0000 (UTC)
Subject: [master] 94ed598 Resurrect the test-code
Message-ID: <20171113205308.D8D6163F81@lists.varnish-cache.org>


commit 94ed59827d3feaa78b2de6c675d8b10a8502e501
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Nov 13 20:51:53 2017 +0000

    Resurrect the test-code

diff --git a/lib/libvarnish/binary_heap.c b/lib/libvarnish/binary_heap.c
index beb9a64..94de6f8 100644
--- a/lib/libvarnish/binary_heap.c
+++ b/lib/libvarnish/binary_heap.c
@@ -456,21 +456,22 @@ binheap_reorder(const struct binheap *bh, unsigned idx)
 #ifdef TEST_DRIVER
 
 #include <stdio.h>
+#include <strings.h>
 
 #include "miniobj.h"
 
 /* Test driver -------------------------------------------------------*/
 
-static void
-vasfail(const char *func, const char *file, int line,
-    const char *cond, int err, int xxx)
+void __attribute__((__noreturn__))
+VAS_Fail(const char *func, const char *file, int line,
+    const char *cond, enum vas_e what)
 {
-	fprintf(stderr, "PANIC: %s %s %d %s %d %d\n",
-		func, file, line, cond, err, xxx);
+	fprintf(stderr, "PANIC: %s %s %d %s %d\n",
+		func, file, line, cond, what);
 	abort();
 }
 
-vas_f *VAS_Fail_Func = vasfail;
+vas_f *VAS_Fail_Func = VAS_Fail;
 
 struct foo {
 	unsigned	magic;
@@ -492,9 +493,9 @@ struct foo {
 struct foo *ff[N];
 
 static int
-cmp(void *priv, void *a, void *b)
+cmp(void *priv, const void *a, const void *b)
 {
-	struct foo *fa, *fb;
+	const struct foo *fa, *fb;
 
 	CAST_OBJ_NOTNULL(fa, a, FOO_MAGIC);
 	CAST_OBJ_NOTNULL(fb, b, FOO_MAGIC);

From phk at FreeBSD.org  Mon Nov 13 21:50:07 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Mon, 13 Nov 2017 21:50:07 +0000 (UTC)
Subject: [master] 793cbad Rename the internal "vev" API to a proper "VEV"
 prefix.
Message-ID: <20171113215007.6B26063381@lists.varnish-cache.org>


commit 793cbad0c6f4d247c06bd592cc71768a6f6f06cf
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Nov 13 21:48:49 2017 +0000

    Rename the internal "vev" API to a proper "VEV" prefix.

diff --git a/bin/varnishd/flint.lnt b/bin/varnishd/flint.lnt
index 3643b1b..7619b33 100644
--- a/bin/varnishd/flint.lnt
+++ b/bin/varnishd/flint.lnt
@@ -7,9 +7,6 @@
 -printf(2, VSB_printf)
 
 -esym(755, vct_*)
--esym(759, vev_*)
--esym(765, vev_*)
--esym(714, vev_*)
 -esym(759, vpf_*)
 -esym(765, vpf_*)
 -esym(714, vpf_*)
diff --git a/bin/varnishd/mgt/mgt.h b/bin/varnishd/mgt/mgt.h
index 92a6f6d..7949d2a 100644
--- a/bin/varnishd/mgt/mgt.h
+++ b/bin/varnishd/mgt/mgt.h
@@ -54,7 +54,7 @@ struct parspec;
 struct vcc;
 struct vclprog;
 
-extern struct vev_base	*mgt_evb;
+extern struct vev_root	*mgt_evb;
 extern unsigned		d_flag;
 extern int		exit_status;
 
diff --git a/bin/varnishd/mgt/mgt_child.c b/bin/varnishd/mgt/mgt_child.c
index 6121ed2..7c9f3c0 100644
--- a/bin/varnishd/mgt/mgt_child.c
+++ b/bin/varnishd/mgt/mgt_child.c
@@ -221,7 +221,7 @@ static int __match_proto__(vev_cb_f)
 child_listener(const struct vev *e, int what)
 {
 
-	if ((what & ~EV_RD) || VLU_Fd(child_std_vlu, child_output)) {
+	if ((what & ~VEV__RD) || VLU_Fd(child_std_vlu, child_output)) {
 		ev_listen = NULL;
 		if (e != NULL)
 			mgt_reap_child();
@@ -365,22 +365,22 @@ mgt_launch_child(struct cli *cli)
 	AN(child_std_vlu);
 
 	AZ(ev_listen);
-	e = vev_new();
+	e = VEV_Alloc();
 	XXXAN(e);
 	e->fd = child_output;
-	e->fd_flags = EV_RD;
+	e->fd_flags = VEV__RD;
 	e->name = "Child listener";
 	e->callback = child_listener;
-	AZ(vev_add(mgt_evb, e));
+	AZ(VEV_Start(mgt_evb, e));
 	ev_listen = e;
 	AZ(ev_poker);
 	if (mgt_param.ping_interval > 0) {
-		e = vev_new();
+		e = VEV_Alloc();
 		XXXAN(e);
 		e->timeout = mgt_param.ping_interval;
 		e->callback = child_poker;
 		e->name = "child poker";
-		AZ(vev_add(mgt_evb, e));
+		AZ(VEV_Start(mgt_evb, e));
 		ev_poker = e;
 	}
 
@@ -439,14 +439,14 @@ mgt_reap_child(void)
 
 	/* Stop the poker */
 	if (ev_poker != NULL) {
-		vev_del(mgt_evb, ev_poker);
+		VEV_Stop(mgt_evb, ev_poker);
 		free(ev_poker);
 	}
 	ev_poker = NULL;
 
 	/* Stop the listener */
 	if (ev_listen != NULL) {
-		vev_del(mgt_evb, ev_listen);
+		VEV_Stop(mgt_evb, ev_listen);
 		free(ev_listen);
 		ev_listen = NULL;
 	}
@@ -522,7 +522,7 @@ mgt_reap_child(void)
 		child_state = CH_DIED;
 
 	/* Pick up any stuff lingering on stdout/stderr */
-	(void)child_listener(NULL, EV_RD);
+	(void)child_listener(NULL, VEV__RD);
 	closefd(&child_output);
 	VLU_Destroy(&child_std_vlu);
 
diff --git a/bin/varnishd/mgt/mgt_cli.c b/bin/varnishd/mgt/mgt_cli.c
index a25cc92..37fe5ed 100644
--- a/bin/varnishd/mgt/mgt_cli.c
+++ b/bin/varnishd/mgt/mgt_cli.c
@@ -422,14 +422,14 @@ mgt_cli_setup(int fdi, int fdo, int auth, const char *ident,
 	AZ(VSB_finish(cli->sb));
 	(void)VCLI_WriteResult(fdo, cli->result, VSB_data(cli->sb));
 
-	ev = vev_new();
+	ev = VEV_Alloc();
 	AN(ev);
 	ev->name = cli->ident;
 	ev->fd = fdi;
-	ev->fd_flags = EV_RD;
+	ev->fd_flags = VEV__RD;
 	ev->callback = mgt_cli_callback2;
 	ev->priv = cli;
-	AZ(vev_add(mgt_evb, ev));
+	AZ(VEV_Start(mgt_evb, ev));
 }
 
 /*--------------------------------------------------------------------*/
@@ -554,13 +554,13 @@ mct_callback(void *priv, const struct suckaddr *sa)
 		VTCP_myname(sock, abuf, sizeof abuf, pbuf, sizeof pbuf);
 		VSB_printf(vsb, "%s %s\n", abuf, pbuf);
 		tn = telnet_new(sock);
-		tn->ev = vev_new();
+		tn->ev = VEV_Alloc();
 		AN(tn->ev);
 		tn->ev->fd = sock;
 		tn->ev->fd_flags = POLLIN;
 		tn->ev->callback = telnet_accept;
 		tn->ev->priv = tn;
-		AZ(vev_add(mgt_evb, tn->ev));
+		AZ(VEV_Start(mgt_evb, tn->ev));
 	}
 	return (0);
 }
@@ -663,14 +663,14 @@ Marg_poker(const struct vev *e, int what)
 
 	MCH_TrackHighFd(s);
 
-	M_conn = vev_new();
+	M_conn = VEV_Alloc();
 	AN(M_conn);
 	M_conn->callback = Marg_connect;
 	M_conn->name = "-M connector";
-	M_conn->fd_flags = EV_WR;
+	M_conn->fd_flags = VEV__WR;
 	M_conn->fd = s;
 	M_fd = s;
-	AZ(vev_add(mgt_evb, M_conn));
+	AZ(VEV_Start(mgt_evb, M_conn));
 	return (0);
 }
 
@@ -702,12 +702,12 @@ mgt_cli_master(const char *M_arg)
 	if (VTAILQ_EMPTY(&m_addr_list))
 		ARGV_ERR("Could not resolve -M argument to address\n");
 	AZ(M_poker);
-	M_poker = vev_new();
+	M_poker = VEV_Alloc();
 	AN(M_poker);
 	M_poker->timeout = M_poll;
 	M_poker->callback = Marg_poker;
 	M_poker->name = "-M poker";
-	AZ(vev_add(mgt_evb, M_poker));
+	AZ(VEV_Start(mgt_evb, M_poker));
 }
 
 static int
diff --git a/bin/varnishd/mgt/mgt_main.c b/bin/varnishd/mgt/mgt_main.c
index 39f1059..c4f9d94 100644
--- a/bin/varnishd/mgt/mgt_main.c
+++ b/bin/varnishd/mgt/mgt_main.c
@@ -61,7 +61,7 @@
 
 struct heritage		heritage;
 unsigned		d_flag = 0;
-struct vev_base		*mgt_evb;
+struct vev_root		*mgt_evb;
 int			exit_status = 0;
 struct vsb		*vident;
 struct VSC_mgt		*VSC_C_mgt;
@@ -563,7 +563,7 @@ main(int argc, char * const *argv)
 
 	/* Various initializations */
 	VTAILQ_INIT(&heritage.socks);
-	mgt_evb = vev_new_base();
+	mgt_evb = VEV_New();
 	AN(mgt_evb);
 
 	/* Initialize transport protocols */
@@ -845,10 +845,10 @@ main(int argc, char * const *argv)
 		fprintf(stderr, "BEGIN of -I file processing\n");
 		mgt_cli_setup(I_fd, 2, 1, "-I file", mgt_I_close, stderr);
 		while (I_fd >= 0) {
-			o = vev_schedule_one(mgt_evb);
+			o = VEV_Once(mgt_evb);
 			if (o != 1)
 				MGT_Complain(C_ERR,
-				    "vev_schedule_one() = %d", o);
+				    "VEV_Once() = %d", o);
 		}
 	}
 
@@ -871,30 +871,30 @@ main(int argc, char * const *argv)
 	if (F_flag)
 		VFIL_null_fd(STDIN_FILENO);
 
-	e = vev_new();
+	e = VEV_Alloc();
 	AN(e);
 	e->callback = mgt_uptime;
 	e->timeout = 1.0;
 	e->name = "mgt_uptime";
-	AZ(vev_add(mgt_evb, e));
+	AZ(VEV_Start(mgt_evb, e));
 
-	e = vev_new();
+	e = VEV_Alloc();
 	AN(e);
 	e->sig = SIGTERM;
 	e->callback = mgt_sigint;
 	e->name = "mgt_sigterm";
-	AZ(vev_add(mgt_evb, e));
+	AZ(VEV_Start(mgt_evb, e));
 
-	e = vev_new();
+	e = VEV_Alloc();
 	AN(e);
 	e->sig = SIGINT;
 	e->callback = mgt_sigint;
 	e->name = "mgt_sigint";
-	AZ(vev_add(mgt_evb, e));
+	AZ(VEV_Start(mgt_evb, e));
 
-	o = vev_schedule(mgt_evb);
+	o = VEV_Loop(mgt_evb);
 	if (o != 0)
-		MGT_Complain(C_ERR, "vev_schedule() = %d", o);
+		MGT_Complain(C_ERR, "VEV_Loop() = %d", o);
 
 	MGT_Complain(C_INFO, "manager dies");
 	(void)VPF_Remove(pfh1);
diff --git a/bin/varnishd/mgt/mgt_vcl.c b/bin/varnishd/mgt/mgt_vcl.c
index 8a879ab..d2428b3 100644
--- a/bin/varnishd/mgt/mgt_vcl.c
+++ b/bin/varnishd/mgt/mgt_vcl.c
@@ -917,13 +917,13 @@ void
 mgt_vcl_init(void)
 {
 
-	e_poker = vev_new();
+	e_poker = VEV_Alloc();
 	AN(e_poker);
 	e_poker->timeout = 3;		// random, prime
 
 	e_poker->callback = mgt_vcl_poker;
 	e_poker->name = "vcl poker";
-	AZ(vev_add(mgt_evb, e_poker));
+	AZ(VEV_Start(mgt_evb, e_poker));
 
 	AZ(atexit(mgt_vcl_atexit));
 
diff --git a/bin/varnishtest/vtc_main.c b/bin/varnishtest/vtc_main.c
index 96ebaec..0d4982d 100644
--- a/bin/varnishtest/vtc_main.c
+++ b/bin/varnishtest/vtc_main.c
@@ -81,7 +81,7 @@ unsigned vtc_maxdur = 60;
 static unsigned vtc_bufsiz = 1024 * 1024;
 
 static VTAILQ_HEAD(, vtc_tst) tst_head = VTAILQ_HEAD_INITIALIZER(tst_head);
-static struct vev_base *vb;
+static struct vev_root *vb;
 static int njob = 0;
 static int npar = 1;			/* Number of parallel tests */
 static int vtc_continue;		/* Continue on error */
@@ -167,7 +167,7 @@ tst_cb(const struct vev *ve, int what)
 		jp->killed = 1;
 		AZ(kill(-jp->child, SIGKILL)); /* XXX: Timeout */
 	} else {
-		assert(what & (EV_RD | EV_HUP));
+		assert(what & (VEV__RD | VEV__HUP));
 	}
 
 	*buf = '\0';
@@ -241,7 +241,7 @@ tst_cb(const struct vev *ve, int what)
 			    ecode ? "skipped" : "passed", t);
 		}
 		if (jp->evt != NULL)
-			vev_del(vb, jp->evt);
+			VEV_Stop(vb, jp->evt);
 
 		FREE_OBJ(jp);
 		return (1);
@@ -309,21 +309,21 @@ start_test(void)
 	}
 	closefd(&p[1]);
 
-	jp->ev = vev_new();
+	jp->ev = VEV_Alloc();
 	AN(jp->ev);
-	jp->ev->fd_flags = EV_RD | EV_HUP | EV_ERR;
+	jp->ev->fd_flags = VEV__RD | VEV__HUP | VEV__ERR;
 	jp->ev->fd = p[0];
 	jp->ev->priv = jp;
 	jp->ev->callback = tst_cb;
-	AZ(vev_add(vb, jp->ev));
+	AZ(VEV_Start(vb, jp->ev));
 
-	jp->evt = vev_new();
+	jp->evt = VEV_Alloc();
 	AN(jp->evt);
 	jp->evt->fd = -1;
 	jp->evt->timeout = vtc_maxdur;
 	jp->evt->priv = jp;
 	jp->evt->callback = tst_cb;
-	AZ(vev_add(vb, jp->evt));
+	AZ(VEV_Start(vb, jp->evt));
 }
 
 /**********************************************************************
@@ -666,7 +666,7 @@ main(int argc, char * const *argv)
 	if (iflg)
 		i_mode();
 
-	vb = vev_new_base();
+	vb = VEV_New();
 
 	i = 0;
 	while (!VTAILQ_EMPTY(&tst_head) || i) {
@@ -679,7 +679,7 @@ main(int argc, char * const *argv)
 			i = 1;
 			continue;
 		}
-		i = vev_schedule_one(vb);
+		i = VEV_Once(vb);
 	}
 	if (vtc_continue)
 		fprintf(stderr,
diff --git a/include/vev.h b/include/vev.h
index 47fd050..0c92f4b 100644
--- a/include/vev.h
+++ b/include/vev.h
@@ -29,7 +29,7 @@
  */
 
 struct vev;
-struct vev_base;
+struct vev_root;
 
 typedef int vev_cb_f(const struct vev *, int what);
 
@@ -42,11 +42,11 @@ struct vev {
 	int			fd;
 	unsigned		fd_flags;
 	unsigned		fd_events;
-#define		EV_RD		POLLIN
-#define		EV_WR		POLLOUT
-#define		EV_ERR		POLLERR
-#define		EV_HUP		POLLHUP
-#define		EV_SIG		-1
+#define		VEV__RD		POLLIN
+#define		VEV__WR		POLLOUT
+#define		VEV__ERR	POLLERR
+#define		VEV__HUP	POLLHUP
+#define		VEV__SIG	-1
 	int			sig;
 	unsigned		sig_flags;
 	double			timeout;
@@ -57,16 +57,16 @@ struct vev {
 	double			__when;
 	unsigned		__binheap_idx;
 	unsigned		__privflags;
-	struct vev_base		*__vevb;
+	struct vev_root		*__vevb;
 };
 
-struct vev_base *vev_new_base(void);
-void vev_destroy_base(struct vev_base *evb);
+struct vev_root *VEV_New(void);
+void VEV_Destroy(struct vev_root *evb);
 
-struct vev *vev_new(void);
+struct vev *VEV_Alloc(void);
 
-int vev_add(struct vev_base *evb, struct vev *e);
-void vev_del(struct vev_base *evb, struct vev *e);
+int VEV_Start(struct vev_root *evb, struct vev *e);
+void VEV_Stop(struct vev_root *evb, struct vev *e);
 
-int vev_schedule_one(struct vev_base *evb);
-int vev_schedule(struct vev_base *evb);
+int VEV_Once(struct vev_root *evb);
+int VEV_Loop(struct vev_root *evb);
diff --git a/lib/libvarnish/vev.c b/lib/libvarnish/vev.c
index 88f7057..b8f3078 100644
--- a/lib/libvarnish/vev.c
+++ b/lib/libvarnish/vev.c
@@ -54,7 +54,7 @@
 #endif
 
 struct vevsig {
-	struct vev_base		*vevb;
+	struct vev_root		*vevb;
 	struct vev		*vev;
 	struct sigaction	sigact;
 	unsigned char		happened;
@@ -63,7 +63,7 @@ struct vevsig {
 static struct vevsig		*vev_sigs;
 static int			vev_nsig;
 
-struct vev_base {
+struct vev_root {
 	unsigned		magic;
 #define VEV_BASE_MAGIC		0x477bcf3d
 	struct pollfd		*pfd;
@@ -95,7 +95,7 @@ struct vev_base {
 static void __match_proto__(binheap_update_t)
 vev_bh_update(void *priv, void *a, unsigned u)
 {
-	struct vev_base *evb;
+	struct vev_root *evb;
 	struct vev *e;
 
 	CAST_OBJ_NOTNULL(evb, priv, VEV_BASE_MAGIC);
@@ -106,14 +106,14 @@ vev_bh_update(void *priv, void *a, unsigned u)
 		evb->pev[u] = e;
 		evb->pfd[u].fd = e->fd;
 		evb->pfd[u].events =
-		    e->fd_flags & (EV_RD|EV_WR|EV_ERR|EV_HUP);
+		    e->fd_flags & (VEV__RD|VEV__WR|VEV__ERR|VEV__HUP);
 	}
 }
 
 static int __match_proto__(binheap_cmp_t)
 vev_bh_cmp(void *priv, const void *a, const void *b)
 {
-	struct vev_base *evb;
+	struct vev_root *evb;
 	const struct vev *ea, *eb;
 
 	CAST_OBJ_NOTNULL(evb, priv, VEV_BASE_MAGIC);
@@ -125,7 +125,7 @@ vev_bh_cmp(void *priv, const void *a, const void *b)
 /*--------------------------------------------------------------------*/
 
 static int
-vev_get_pfd(struct vev_base *evb)
+vev_get_pfd(struct vev_root *evb)
 {
 	unsigned u;
 
@@ -187,10 +187,10 @@ vev_sighandler(int sig)
 
 /*--------------------------------------------------------------------*/
 
-struct vev_base *
-vev_new_base(void)
+struct vev_root *
+VEV_New(void)
 {
-	struct vev_base *evb;
+	struct vev_root *evb;
 
 	evb = calloc(1, sizeof *evb);
 	if (evb == NULL)
@@ -215,7 +215,7 @@ vev_new_base(void)
 /*--------------------------------------------------------------------*/
 
 void
-vev_destroy_base(struct vev_base *evb)
+VEV_Destroy(struct vev_root *evb)
 {
 	CHECK_OBJ_NOTNULL(evb, VEV_BASE_MAGIC);
 	assert(evb->thread == pthread_self());
@@ -226,7 +226,7 @@ vev_destroy_base(struct vev_base *evb)
 /*--------------------------------------------------------------------*/
 
 struct vev *
-vev_new(void)
+VEV_Alloc(void)
 {
 	struct vev *e;
 
@@ -240,7 +240,7 @@ vev_new(void)
 /*--------------------------------------------------------------------*/
 
 int
-vev_add(struct vev_base *evb, struct vev *e)
+VEV_Start(struct vev_root *evb, struct vev *e)
 {
 	struct vevsig *es;
 
@@ -298,7 +298,7 @@ vev_add(struct vev_base *evb, struct vev *e)
 /*--------------------------------------------------------------------*/
 
 void
-vev_del(struct vev_base *evb, struct vev *e)
+VEV_Stop(struct vev_root *evb, struct vev *e)
 {
 	struct vevsig *es;
 
@@ -334,14 +334,14 @@ vev_del(struct vev_base *evb, struct vev *e)
 /*--------------------------------------------------------------------*/
 
 int
-vev_schedule(struct vev_base *evb)
+VEV_Loop(struct vev_root *evb)
 {
 	int i;
 
 	CHECK_OBJ_NOTNULL(evb, VEV_BASE_MAGIC);
 	assert(evb->thread == pthread_self());
 	do
-		i = vev_schedule_one(evb);
+		i = VEV_Once(evb);
 	while (i == 1);
 	return (i);
 }
@@ -349,14 +349,14 @@ vev_schedule(struct vev_base *evb)
 /*--------------------------------------------------------------------*/
 
 static int
-vev_sched_timeout(struct vev_base *evb, struct vev *e, double t)
+vev_sched_timeout(struct vev_root *evb, struct vev *e, double t)
 {
 	int i;
 
 
 	i = e->callback(e, 0);
 	if (i) {
-		vev_del(evb, e);
+		VEV_Stop(evb, e);
 		free(e);
 	} else {
 		e->__when = t + e->timeout;
@@ -367,7 +367,7 @@ vev_sched_timeout(struct vev_base *evb, struct vev *e, double t)
 }
 
 static int
-vev_sched_signal(struct vev_base *evb)
+vev_sched_signal(struct vev_root *evb)
 {
 	int i, j;
 	struct vevsig *es;
@@ -381,9 +381,9 @@ vev_sched_signal(struct vev_base *evb)
 		es->happened = 0;
 		e = es->vev;
 		assert(e != NULL);
-		i = e->callback(e, EV_SIG);
+		i = e->callback(e, VEV__SIG);
 		if (i) {
-			vev_del(evb, e);
+			VEV_Stop(evb, e);
 			free(e);
 		}
 	}
@@ -391,7 +391,7 @@ vev_sched_signal(struct vev_base *evb)
 }
 
 int
-vev_schedule_one(struct vev_base *evb)
+VEV_Once(struct vev_root *evb)
 {
 	double t;
 	struct vev *e;
@@ -451,7 +451,7 @@ vev_schedule_one(struct vev_base *evb)
 			e->fd_events = 0;
 			i--;
 			if (k) {
-				vev_del(evb, e);
+				VEV_Stop(evb, e);
 				free(e);
 			}
 		}

From fgsch at lodoss.net  Tue Nov 14 05:33:23 2017
From: fgsch at lodoss.net (Federico Schwindt)
Date: Tue, 14 Nov 2017 14:33:23 +0900
Subject: [master] adc4bf3 Disable TSAN for now
In-Reply-To: <CABoVN9AnJkuQJXak3yXNb1bmvJun-zD8nurLcpudYmUeck=aog@mail.gmail.com>
References: <20171113122706.4BC9D63C34@lists.varnish-cache.org>
 <CABoVN9AnJkuQJXak3yXNb1bmvJun-zD8nurLcpudYmUeck=aog@mail.gmail.com>
Message-ID: <CAJV_h0YNh7ndTwFQfbKYi+eU7HA5TRSgMPoDveGz16uEZNqBqw@mail.gmail.com>

You can ignore varnishtest, and this is exactly what I'm doing with the
suppression file.

The reason I've disabled it for now is because of the many reported issues
in varnishd.
For the ones we are not planning to fix, I will add them to the suppression
file as well.

On 13 Nov 2017 12:30 pm, "Dridi Boukelmoune" <dridi at varni.sh> wrote:

> On Mon, Nov 13, 2017 at 1:27 PM, Federico G. Schwindt <fgsch at lodoss.net>
> wrote:
> >
> > commit adc4bf34f55c18d82c55336cd0d11d2b58f3b1ae
> > Author: Federico G. Schwindt <fgsch at lodoss.net>
> > Date:   Mon Nov 13 12:26:04 2017 +0000
> >
> >     Disable TSAN for now
> >
> >     It's not ready for primetime yet.
>
> I looked at it in the context of h2 a while ago, and before we can
> test varnishd via the test suite there are many data races in
> varnishtest that we need to fix first :(
>
> Dridi
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://www.varnish-cache.org/lists/pipermail/varnish-commit/attachments/20171114/3a992c9c/attachment-0001.html>

From phk at FreeBSD.org  Tue Nov 14 09:31:10 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Tue, 14 Nov 2017 09:31:10 +0000 (UTC)
Subject: [master] c34b28f Make admin health an opaque struct.
Message-ID: <20171114093110.9781C630CF@lists.varnish-cache.org>


commit c34b28fb7cc660ef1af3c728106546d43718d4d2
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Nov 14 07:24:24 2017 +0000

    Make admin health an opaque struct.

diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c
index de03e88..deee34e 100644
--- a/bin/varnishd/cache/cache_backend.c
+++ b/bin/varnishd/cache/cache_backend.c
@@ -326,7 +326,7 @@ vbe_panic(const struct director *d, struct vsb *vsb)
 	VSB_printf(vsb, "health = %s,\n",
 	    bp->healthy ? "healthy" : "sick");
 	VSB_printf(vsb, "admin_health = %s, changed = %f,\n",
-	    bp->admin_health, bp->health_changed);
+	    VBE_AdminHealth(bp->admin_health), bp->health_changed);
 	VSB_printf(vsb, "n_conn = %u,\n", bp->n_conn);
 }
 
diff --git a/bin/varnishd/cache/cache_backend.h b/bin/varnishd/cache/cache_backend.h
index 58c6d83..8c96c17 100644
--- a/bin/varnishd/cache/cache_backend.h
+++ b/bin/varnishd/cache/cache_backend.h
@@ -41,6 +41,7 @@ struct vbp_target;
 struct vrt_ctx;
 struct vrt_backend_probe;
 struct tcp_pool;
+struct vbe_ahealth;
 
 /*--------------------------------------------------------------------
  * An instance of a backend from a VCL program.
@@ -64,7 +65,7 @@ struct backend {
 
 	struct vbp_target	*probe;
 	unsigned		healthy;
-	const char		*admin_health;
+	const struct vbe_ahealth *admin_health;
 	double			health_changed;
 
 	struct VSC_vbe		*vsc;
@@ -90,6 +91,8 @@ unsigned VBE_Healthy(const struct backend *b, double *changed);
 void VBE_Event(struct backend *, enum vcl_event_e);
 #endif
 void VBE_Delete(struct backend *be);
+const char *
+VBE_AdminHealth(const struct vbe_ahealth *);
 
 /* cache_backend_probe.c */
 void VBP_Insert(struct backend *b, struct vrt_backend_probe const *p,
diff --git a/bin/varnishd/cache/cache_backend_cfg.c b/bin/varnishd/cache/cache_backend_cfg.c
index 16e51e3..30cb6c2 100644
--- a/bin/varnishd/cache/cache_backend_cfg.c
+++ b/bin/varnishd/cache/cache_backend_cfg.c
@@ -56,10 +56,49 @@ static VTAILQ_HEAD(, backend) cool_backends =
     VTAILQ_HEAD_INITIALIZER(cool_backends);
 static struct lock backends_mtx;
 
-static const char * const vbe_ah_healthy	= "healthy";
-static const char * const vbe_ah_sick		= "sick";
-static const char * const vbe_ah_probe		= "probe";
-static const char * const vbe_ah_deleted	= "deleted";
+/*--------------------------------------------------------------------*/
+
+#define AHEALTH_LIST		\
+	AHEALTH(healthy)	\
+	AHEALTH(sick)		\
+	AHEALTH(probe)		\
+	AHEALTH(deleted)
+
+struct vbe_ahealth {
+	const char		*state;
+};
+
+#define AHEALTH(x) static const struct vbe_ahealth vbe_ah_##x[1] = {{ #x }};
+AHEALTH_LIST
+#undef AHEALTH
+
+/*---------------------------------------------------------------------
+ * String to admin_health
+ */
+
+static const struct vbe_ahealth *
+vbe_str2adminhealth(const char *wstate)
+{
+
+#define FOO(x, y) if (strcasecmp(wstate, #x) == 0) return (vbe_ah_##y)
+	FOO(healthy,	healthy);
+	FOO(sick,	sick);
+	FOO(probe,	probe);
+	FOO(auto,	probe);
+	return (NULL);
+#undef FOO
+}
+
+const char *
+VBE_AdminHealth(const struct vbe_ahealth *ah)
+{
+#define AHEALTH(x) if (ah == vbe_ah_##x) return(ah->state);
+AHEALTH_LIST
+#undef AHEALTH
+	WRONG("Wrong Admin Health State");
+}
+
+#undef AHEALTH_LIST
 
 /*--------------------------------------------------------------------
  * Create a new static or dynamic director::backend instance.
@@ -236,23 +275,6 @@ VBE_Delete(struct backend *be)
 	FREE_OBJ(be);
 }
 
-/*---------------------------------------------------------------------
- * String to admin_health
- */
-
-static const char *
-vbe_str2adminhealth(const char *wstate)
-{
-
-#define FOO(x, y) if (strcasecmp(wstate, #x) == 0) return (vbe_ah_##y)
-	FOO(healthy,	healthy);
-	FOO(sick,	sick);
-	FOO(probe,	probe);
-	FOO(auto,	probe);
-	return (NULL);
-#undef FOO
-}
-
 /*--------------------------------------------------------------------
  * Test if backend is healthy and report when it last changed
  */
@@ -349,7 +371,7 @@ do_list(struct cli *cli, struct backend *b, void *priv)
 
 	VCLI_Out(cli, "\n%-30s", b->display_name);
 
-	VCLI_Out(cli, " %-10s", b->admin_health);
+	VCLI_Out(cli, " %-10s", VBE_AdminHealth(b->admin_health));
 
 	if (b->probe == NULL)
 		VCLI_Out(cli, " %-20s", "Healthy (no probe)");
@@ -396,17 +418,17 @@ cli_backend_list(struct cli *cli, const char * const *av, void *priv)
 static int __match_proto__()
 do_set_health(struct cli *cli, struct backend *b, void *priv)
 {
-	const char **ah;
+	const struct vbe_ahealth *ah;
 	unsigned prev;
 
 	(void)cli;
 	AN(priv);
-	ah = priv;
-	AN(*ah);
+	ah = *(const struct vbe_ahealth **)priv;
+	AN(ah);
 	CHECK_OBJ_NOTNULL(b, BACKEND_MAGIC);
 	prev = VBE_Healthy(b, NULL);
 	if (b->admin_health != vbe_ah_deleted)
-		b->admin_health = *ah;
+		b->admin_health = ah;
 	if (prev != VBE_Healthy(b, NULL))
 		b->health_changed = VTIM_real();
 
@@ -416,7 +438,7 @@ do_set_health(struct cli *cli, struct backend *b, void *priv)
 static void __match_proto__()
 cli_backend_set_health(struct cli *cli, const char * const *av, void *priv)
 {
-	const char *ah;
+	const struct vbe_ahealth *ah;
 	int n;
 
 	(void)av;

From phk at FreeBSD.org  Tue Nov 14 09:31:10 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Tue, 14 Nov 2017 09:31:10 +0000 (UTC)
Subject: [master] bce70b9 Lift events up to director level
Message-ID: <20171114093110.B4340630D2@lists.varnish-cache.org>


commit bce70b95385dcdf1e6c8da61ee56b6decc77ab99
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Nov 14 08:00:59 2017 +0000

    Lift events up to director level

diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c
index deee34e..7d65953 100644
--- a/bin/varnishd/cache/cache_backend.c
+++ b/bin/varnishd/cache/cache_backend.c
@@ -309,6 +309,35 @@ vbe_dir_http1pipe(const struct director *d, struct req *req, struct busyobj *bo)
 /*--------------------------------------------------------------------*/
 
 static void
+vbe_dir_event(const struct director *d, enum vcl_event_e ev)
+{
+	struct backend *bp;
+
+	CHECK_OBJ_NOTNULL(d, DIRECTOR_MAGIC);
+	CAST_OBJ_NOTNULL(bp, d->priv, BACKEND_MAGIC);
+
+	if (ev == VCL_EVENT_WARM) {
+		AZ(bp->vsc);
+		bp->vsc = VSC_vbe_New(bp->display_name);
+		AN(bp->vsc);
+	}
+
+	if (bp->probe != NULL && ev == VCL_EVENT_WARM)
+		VBP_Control(bp, 1);
+
+	if (bp->probe != NULL && ev == VCL_EVENT_COLD)
+		VBP_Control(bp, 0);
+
+	if (ev == VCL_EVENT_COLD) {
+		AN(bp->vsc);
+		VSC_vbe_Destroy(&bp->vsc);
+		AZ(bp->vsc);
+	}
+}
+
+/*--------------------------------------------------------------------*/
+
+static void
 vbe_panic(const struct director *d, struct vsb *vsb)
 {
 	struct backend *bp;
@@ -349,5 +378,6 @@ VBE_fill_director(struct backend *be)
 	d->gethdrs = vbe_dir_gethdrs;
 	d->getip = vbe_dir_getip;
 	d->finish = vbe_dir_finish;
+	d->event = vbe_dir_event;
 	d->panic = vbe_panic;
 }
diff --git a/bin/varnishd/cache/cache_backend.h b/bin/varnishd/cache/cache_backend.h
index 8c96c17..72429e1 100644
--- a/bin/varnishd/cache/cache_backend.h
+++ b/bin/varnishd/cache/cache_backend.h
@@ -87,9 +87,6 @@ void VBE_fill_director(struct backend *be);
 /* cache_backend_cfg.c */
 void VBE_SetHappy(const struct backend *, uint64_t);
 unsigned VBE_Healthy(const struct backend *b, double *changed);
-#ifdef VCL_MET_MAX
-void VBE_Event(struct backend *, enum vcl_event_e);
-#endif
 void VBE_Delete(struct backend *be);
 const char *
 VBE_AdminHealth(const struct vbe_ahealth *);
diff --git a/bin/varnishd/cache/cache_backend_cfg.c b/bin/varnishd/cache/cache_backend_cfg.c
index 30cb6c2..1d54bfa 100644
--- a/bin/varnishd/cache/cache_backend_cfg.c
+++ b/bin/varnishd/cache/cache_backend_cfg.c
@@ -39,7 +39,6 @@
 #include "cache_varnishd.h"
 
 #include "vcli_serve.h"
-#include "vcl.h"
 #include "vtim.h"
 #include "waiter/waiter.h"
 
@@ -220,32 +219,6 @@ VBE_SetHappy(const struct backend *be, uint64_t happy)
  */
 
 void
-VBE_Event(struct backend *be, enum vcl_event_e ev)
-{
-
-	CHECK_OBJ_NOTNULL(be, BACKEND_MAGIC);
-
-	if (ev == VCL_EVENT_WARM) {
-		Lck_Lock(&backends_mtx);
-		be->vsc = VSC_vbe_New(be->display_name);
-		AN(be->vsc);
-		Lck_Unlock(&backends_mtx);
-	}
-
-	if (be->probe != NULL && ev == VCL_EVENT_WARM)
-		VBP_Control(be, 1);
-
-	if (be->probe != NULL && ev == VCL_EVENT_COLD)
-		VBP_Control(be, 0);
-
-	if (ev == VCL_EVENT_COLD) {
-		Lck_Lock(&backends_mtx);
-		VSC_vbe_Destroy(&be->vsc);
-		Lck_Unlock(&backends_mtx);
-	}
-}
-
-void
 VBE_Delete(struct backend *be)
 {
 	ASSERT_CLI();
diff --git a/bin/varnishd/cache/cache_director.c b/bin/varnishd/cache/cache_director.c
index 3fd9aec..563f46c 100644
--- a/bin/varnishd/cache/cache_director.c
+++ b/bin/varnishd/cache/cache_director.c
@@ -184,6 +184,18 @@ VRT_Healthy(VRT_CTX, VCL_BACKEND be)
 	return (be->healthy(be, ctx->bo, NULL));
 }
 
+/* Send Event ----------------------------------------------------------
+ */
+
+void
+VDI_Event(const struct director *d, enum vcl_event_e ev)
+{
+
+	CHECK_OBJ_NOTNULL(d, DIRECTOR_MAGIC);
+	if (d->event != NULL)
+		d->event(d, ev);
+}
+
 /* Dump panic info -----------------------------------------------------
  */
 
diff --git a/bin/varnishd/cache/cache_director.h b/bin/varnishd/cache/cache_director.h
index 8f60d6a..fcfa75f 100644
--- a/bin/varnishd/cache/cache_director.h
+++ b/bin/varnishd/cache/cache_director.h
@@ -53,6 +53,8 @@ typedef void vdi_finish_f(const struct director *, struct worker *,
 typedef enum sess_close vdi_http1pipe_f(const struct director *, struct req *,
     struct busyobj *);
 
+typedef void vdi_event_f(const struct director *, enum vcl_event_e);
+
 typedef void vdi_panic_f(const struct director *, struct vsb *);
 
 struct director {
@@ -67,6 +69,7 @@ struct director {
 	vdi_getbody_f		*getbody;
 	vdi_getip_f		*getip;
 	vdi_finish_f		*finish;
+	vdi_event_f		*event;
 	vdi_panic_f		*panic;
 	void			*priv;
 	const void		*priv2;
diff --git a/bin/varnishd/cache/cache_varnishd.h b/bin/varnishd/cache/cache_varnishd.h
index 8402829..61bd187 100644
--- a/bin/varnishd/cache/cache_varnishd.h
+++ b/bin/varnishd/cache/cache_varnishd.h
@@ -70,6 +70,7 @@ const struct suckaddr *VDI_GetIP(struct worker *, struct busyobj *);
 void VDI_Finish(struct worker *wrk, struct busyobj *bo);
 enum sess_close VDI_Http1Pipe(struct req *, struct busyobj *);
 void VDI_Panic(const struct director *, struct vsb *, const char *nm);
+void VDI_Event(const struct director *d, enum vcl_event_e ev);
 
 /* cache_exp.c */
 double EXP_Ttl(const struct req *, const struct objcore *);
diff --git a/bin/varnishd/cache/cache_vcl.c b/bin/varnishd/cache/cache_vcl.c
index 369ede0..f5ded6b 100644
--- a/bin/varnishd/cache/cache_vcl.c
+++ b/bin/varnishd/cache/cache_vcl.c
@@ -345,7 +345,7 @@ VCL_AddBackend(struct vcl *vcl, struct backend *be)
 
 	if (VCL_WARM(vcl))
 		/* Only when adding backend to already warm VCL */
-		VBE_Event(be, VCL_EVENT_WARM);
+		VDI_Event(be->director, VCL_EVENT_WARM);
 	else if (vcl->temp != VCL_TEMP_INIT)
 		WRONG("Dynamic Backends can only be added to warm VCLs");
 	AZ(errno=pthread_rwlock_unlock(&vcl->temp_rwl));
@@ -367,7 +367,7 @@ VCL_DelBackend(struct backend *be)
 
 	AZ(errno=pthread_rwlock_rdlock(&vcl->temp_rwl));
 	if (VCL_WARM(vcl))
-		VBE_Event(be, VCL_EVENT_COLD);
+		VDI_Event(be->director, VCL_EVENT_COLD);
 	AZ(errno=pthread_rwlock_unlock(&vcl->temp_rwl));
 }
 
@@ -381,7 +381,7 @@ vcl_BackendEvent(const struct vcl *vcl, enum vcl_event_e e)
 	AZ(vcl->busy);
 
 	VTAILQ_FOREACH(be, &vcl->backend_list, vcl_list)
-		VBE_Event(be, e);
+		VDI_Event(be->director, e);
 }
 
 static void

From phk at FreeBSD.org  Tue Nov 14 09:31:10 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Tue, 14 Nov 2017 09:31:10 +0000 (UTC)
Subject: [master] 1d26aa4 Have VCL track backends at the director level.
Message-ID: <20171114093110.D1EF6630D6@lists.varnish-cache.org>


commit 1d26aa4c6d0fcaeef2675bd2a1d7b6a3b70cc6a2
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Nov 14 08:22:59 2017 +0000

    Have VCL track backends at the director level.

diff --git a/bin/varnishd/cache/cache_backend.h b/bin/varnishd/cache/cache_backend.h
index 72429e1..993aa4c 100644
--- a/bin/varnishd/cache/cache_backend.h
+++ b/bin/varnishd/cache/cache_backend.h
@@ -54,12 +54,10 @@ struct backend {
 	unsigned		n_conn;
 
 	VTAILQ_ENTRY(backend)	list;
-	VTAILQ_ENTRY(backend)	vcl_list;
 	struct lock		mtx;
 
 	VRT_BACKEND_FIELDS()
 
-	struct vcl		*vcl;
 	char			*display_name;
 
 
@@ -87,9 +85,8 @@ void VBE_fill_director(struct backend *be);
 /* cache_backend_cfg.c */
 void VBE_SetHappy(const struct backend *, uint64_t);
 unsigned VBE_Healthy(const struct backend *b, double *changed);
-void VBE_Delete(struct backend *be);
-const char *
-VBE_AdminHealth(const struct vbe_ahealth *);
+void VBE_Delete(const struct director *);
+const char *VBE_AdminHealth(const struct vbe_ahealth *);
 
 /* cache_backend_probe.c */
 void VBP_Insert(struct backend *b, struct vrt_backend_probe const *p,
@@ -99,5 +96,5 @@ void VBP_Control(const struct backend *b, int stop);
 void VBP_Status(struct cli *cli, const struct backend *, int details);
 
 /* cache_vcl.c */
-int VCL_AddBackend(struct vcl *, struct backend *);
-void VCL_DelBackend(struct backend *);
+int VCL_AddBackend(struct vcl *, struct director *);
+void VCL_DelBackend(const struct director *);
diff --git a/bin/varnishd/cache/cache_backend_cfg.c b/bin/varnishd/cache/cache_backend_cfg.c
index 1d54bfa..78b20cb 100644
--- a/bin/varnishd/cache/cache_backend_cfg.c
+++ b/bin/varnishd/cache/cache_backend_cfg.c
@@ -141,8 +141,6 @@ VRT_new_backend(VRT_CTX, const struct vrt_backend *vrt)
 	AN(b->display_name);
 	VSB_destroy(&vsb);
 
-	b->vcl = vcl;
-
 	b->healthy = 1;
 	b->health_changed = VTIM_real();
 	b->admin_health = vbe_ah_probe;
@@ -165,7 +163,7 @@ VRT_new_backend(VRT_CTX, const struct vrt_backend *vrt)
 		VBP_Insert(b, vbp, b->tcp_pool);
 	}
 
-	retval = VCL_AddBackend(ctx->vcl, b);
+	retval = VCL_AddBackend(ctx->vcl, b->director);
 
 	if (retval == 0)
 		return (b->director);
@@ -219,10 +217,12 @@ VBE_SetHappy(const struct backend *be, uint64_t happy)
  */
 
 void
-VBE_Delete(struct backend *be)
+VBE_Delete(const struct director *d)
 {
+	struct backend *be;
+
 	ASSERT_CLI();
-	CHECK_OBJ_NOTNULL(be, BACKEND_MAGIC);
+	CAST_OBJ_NOTNULL(be, d->priv, BACKEND_MAGIC);
 
 	if (be->probe != NULL)
 		VBP_Remove(be);
@@ -457,8 +457,8 @@ VBE_Poll(void)
 		if (be->n_conn > 0)
 			continue;
 		Lck_Unlock(&backends_mtx);
-		VCL_DelBackend(be);
-		VBE_Delete(be);
+		VCL_DelBackend(be->director);
+		VBE_Delete(be->director);
 		Lck_Lock(&backends_mtx);
 	}
 	Lck_Unlock(&backends_mtx);
diff --git a/bin/varnishd/cache/cache_director.h b/bin/varnishd/cache/cache_director.h
index fcfa75f..719ef99 100644
--- a/bin/varnishd/cache/cache_director.h
+++ b/bin/varnishd/cache/cache_director.h
@@ -73,4 +73,8 @@ struct director {
 	vdi_panic_f		*panic;
 	void			*priv;
 	const void		*priv2;
+
+	/* Internal Housekeeping fields */
+	VTAILQ_ENTRY(director)	list;
+	struct vcl		*vcl;
 };
diff --git a/bin/varnishd/cache/cache_vcl.c b/bin/varnishd/cache/cache_vcl.c
index f5ded6b..38cb7d0 100644
--- a/bin/varnishd/cache/cache_vcl.c
+++ b/bin/varnishd/cache/cache_vcl.c
@@ -70,7 +70,7 @@ struct vcl {
 	unsigned		discard;
 	const char		*temp;
 	pthread_rwlock_t	temp_rwl;
-	VTAILQ_HEAD(,backend)	backend_list;
+	VTAILQ_HEAD(,director)	director_list;
 	VTAILQ_HEAD(,vclref)	ref_list;
 	int			nrefs;
 	struct vcl		*label;
@@ -327,11 +327,11 @@ VCL_Rel(struct vcl **vcc)
 /*--------------------------------------------------------------------*/
 
 int
-VCL_AddBackend(struct vcl *vcl, struct backend *be)
+VCL_AddBackend(struct vcl *vcl, struct director *d)
 {
 
 	CHECK_OBJ_NOTNULL(vcl, VCL_MAGIC);
-	CHECK_OBJ_NOTNULL(be, BACKEND_MAGIC);
+	CHECK_OBJ_NOTNULL(d, DIRECTOR_MAGIC);
 
 	AZ(errno=pthread_rwlock_rdlock(&vcl->temp_rwl));
 	if (vcl->temp == VCL_TEMP_COOLING) {
@@ -340,12 +340,13 @@ VCL_AddBackend(struct vcl *vcl, struct backend *be)
 	}
 
 	Lck_Lock(&vcl_mtx);
-	VTAILQ_INSERT_TAIL(&vcl->backend_list, be, vcl_list);
+	VTAILQ_INSERT_TAIL(&vcl->director_list, d, list);
+	d->vcl = vcl;
 	Lck_Unlock(&vcl_mtx);
 
 	if (VCL_WARM(vcl))
 		/* Only when adding backend to already warm VCL */
-		VDI_Event(be->director, VCL_EVENT_WARM);
+		VDI_Event(d, VCL_EVENT_WARM);
 	else if (vcl->temp != VCL_TEMP_INIT)
 		WRONG("Dynamic Backends can only be added to warm VCLs");
 	AZ(errno=pthread_rwlock_unlock(&vcl->temp_rwl));
@@ -354,50 +355,50 @@ VCL_AddBackend(struct vcl *vcl, struct backend *be)
 }
 
 void
-VCL_DelBackend(struct backend *be)
+VCL_DelBackend(const struct director *d)
 {
 	struct vcl *vcl;
 
-	CHECK_OBJ_NOTNULL(be, BACKEND_MAGIC);
-	vcl = be->vcl;
+	CHECK_OBJ_NOTNULL(d, DIRECTOR_MAGIC);
+	vcl = d->vcl;
 	CHECK_OBJ_NOTNULL(vcl, VCL_MAGIC);
 	Lck_Lock(&vcl_mtx);
-	VTAILQ_REMOVE(&vcl->backend_list, be, vcl_list);
+	VTAILQ_REMOVE(&vcl->director_list, d, list);
 	Lck_Unlock(&vcl_mtx);
 
 	AZ(errno=pthread_rwlock_rdlock(&vcl->temp_rwl));
 	if (VCL_WARM(vcl))
-		VDI_Event(be->director, VCL_EVENT_COLD);
+		VDI_Event(d, VCL_EVENT_COLD);
 	AZ(errno=pthread_rwlock_unlock(&vcl->temp_rwl));
 }
 
 static void
 vcl_BackendEvent(const struct vcl *vcl, enum vcl_event_e e)
 {
-	struct backend *be;
+	struct director *d;
 
 	ASSERT_CLI();
 	CHECK_OBJ_NOTNULL(vcl, VCL_MAGIC);
 	AZ(vcl->busy);
 
-	VTAILQ_FOREACH(be, &vcl->backend_list, vcl_list)
-		VDI_Event(be->director, e);
+	VTAILQ_FOREACH(d, &vcl->director_list, list)
+		VDI_Event(d, e);
 }
 
 static void
 vcl_KillBackends(struct vcl *vcl)
 {
-	struct backend *be;
+	struct director *d;
 
 	CHECK_OBJ_NOTNULL(vcl, VCL_MAGIC);
 	AZ(vcl->busy);
 	assert(VTAILQ_EMPTY(&vcl->ref_list));
 	while (1) {
-		be = VTAILQ_FIRST(&vcl->backend_list);
-		if (be == NULL)
+		d = VTAILQ_FIRST(&vcl->director_list);
+		if (d == NULL)
 			break;
-		VTAILQ_REMOVE(&vcl->backend_list, be, vcl_list);
-		VBE_Delete(be);
+		VTAILQ_REMOVE(&vcl->director_list, d, list);
+		VBE_Delete(d);
 	}
 }
 
@@ -752,7 +753,7 @@ vcl_load(struct cli *cli, struct vrt_ctx *ctx,
 
 	vcl->loaded_name = strdup(name);
 	XXXAN(vcl->loaded_name);
-	VTAILQ_INIT(&vcl->backend_list);
+	VTAILQ_INIT(&vcl->director_list);
 	VTAILQ_INIT(&vcl->ref_list);
 
 	vcl->temp = VCL_TEMP_INIT;

From phk at FreeBSD.org  Tue Nov 14 09:31:10 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Tue, 14 Nov 2017 09:31:10 +0000 (UTC)
Subject: [master] ccd13da Put VCL in charge of director/backend destruction
 for registered directors.
Message-ID: <20171114093111.0256E630DB@lists.varnish-cache.org>


commit ccd13da4d8cee3aed453346876ff205a961d266f
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Nov 14 08:28:36 2017 +0000

    Put VCL in charge of director/backend destruction for registered directors.

diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c
index 7d65953..fc2f9db 100644
--- a/bin/varnishd/cache/cache_backend.c
+++ b/bin/varnishd/cache/cache_backend.c
@@ -379,5 +379,6 @@ VBE_fill_director(struct backend *be)
 	d->getip = vbe_dir_getip;
 	d->finish = vbe_dir_finish;
 	d->event = vbe_dir_event;
+	d->destroy = VBE_Delete;
 	d->panic = vbe_panic;
 }
diff --git a/bin/varnishd/cache/cache_backend_cfg.c b/bin/varnishd/cache/cache_backend_cfg.c
index 78b20cb..5098810 100644
--- a/bin/varnishd/cache/cache_backend_cfg.c
+++ b/bin/varnishd/cache/cache_backend_cfg.c
@@ -458,7 +458,6 @@ VBE_Poll(void)
 			continue;
 		Lck_Unlock(&backends_mtx);
 		VCL_DelBackend(be->director);
-		VBE_Delete(be->director);
 		Lck_Lock(&backends_mtx);
 	}
 	Lck_Unlock(&backends_mtx);
diff --git a/bin/varnishd/cache/cache_director.h b/bin/varnishd/cache/cache_director.h
index 719ef99..9d7a6b9 100644
--- a/bin/varnishd/cache/cache_director.h
+++ b/bin/varnishd/cache/cache_director.h
@@ -55,6 +55,8 @@ typedef enum sess_close vdi_http1pipe_f(const struct director *, struct req *,
 
 typedef void vdi_event_f(const struct director *, enum vcl_event_e);
 
+typedef void vdi_destroy_f(const struct director *);
+
 typedef void vdi_panic_f(const struct director *, struct vsb *);
 
 struct director {
@@ -70,6 +72,7 @@ struct director {
 	vdi_getip_f		*getip;
 	vdi_finish_f		*finish;
 	vdi_event_f		*event;
+	vdi_destroy_f		*destroy;
 	vdi_panic_f		*panic;
 	void			*priv;
 	const void		*priv2;
diff --git a/bin/varnishd/cache/cache_vcl.c b/bin/varnishd/cache/cache_vcl.c
index 38cb7d0..409249c 100644
--- a/bin/varnishd/cache/cache_vcl.c
+++ b/bin/varnishd/cache/cache_vcl.c
@@ -332,6 +332,7 @@ VCL_AddBackend(struct vcl *vcl, struct director *d)
 
 	CHECK_OBJ_NOTNULL(vcl, VCL_MAGIC);
 	CHECK_OBJ_NOTNULL(d, DIRECTOR_MAGIC);
+	AN(d->destroy);
 
 	AZ(errno=pthread_rwlock_rdlock(&vcl->temp_rwl));
 	if (vcl->temp == VCL_TEMP_COOLING) {
@@ -370,6 +371,8 @@ VCL_DelBackend(const struct director *d)
 	if (VCL_WARM(vcl))
 		VDI_Event(d, VCL_EVENT_COLD);
 	AZ(errno=pthread_rwlock_unlock(&vcl->temp_rwl));
+	AN(d->destroy);
+	d->destroy(d);
 }
 
 static void
@@ -398,7 +401,8 @@ vcl_KillBackends(struct vcl *vcl)
 		if (d == NULL)
 			break;
 		VTAILQ_REMOVE(&vcl->director_list, d, list);
-		VBE_Delete(d);
+		AN(d->destroy);
+		d->destroy(d);
 	}
 }
 

From phk at FreeBSD.org  Tue Nov 14 09:31:11 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Tue, 14 Nov 2017 09:31:11 +0000 (UTC)
Subject: [master] 7de8e83 Lift the health fields from backend to director
Message-ID: <20171114093111.203C6630DF@lists.varnish-cache.org>


commit 7de8e8369b514aeb52edd22cb5388ea4749afe71
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Nov 14 09:08:50 2017 +0000

    Lift the health fields from backend to director

diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c
index fc2f9db..94739eb 100644
--- a/bin/varnishd/cache/cache_backend.c
+++ b/bin/varnishd/cache/cache_backend.c
@@ -75,7 +75,7 @@ vbe_dir_getfd(struct worker *wrk, struct backend *bp, struct busyobj *bo)
 	CHECK_OBJ_NOTNULL(bp, BACKEND_MAGIC);
 	AN(bp->vsc);
 
-	if (!VBE_Healthy(bp, NULL)) {
+	if (!VDI_Healthy(bp->director, NULL)) {
 		VSLb(bo->vsl, SLT_FetchError,
 		     "backend %s: unhealthy", bp->display_name);
 		// XXX: per backend stats ?
@@ -147,7 +147,7 @@ vbe_dir_healthy(const struct director *d, const struct busyobj *bo,
 	CHECK_OBJ_NOTNULL(d, DIRECTOR_MAGIC);
 	CHECK_OBJ_ORNULL(bo, BUSYOBJ_MAGIC);
 	CAST_OBJ_NOTNULL(be, d->priv, BACKEND_MAGIC);
-	return (VBE_Healthy(be, changed));
+	return (VDI_Healthy(be->director, changed));
 }
 
 static void __match_proto__(vdi_finish_f)
@@ -353,9 +353,10 @@ vbe_panic(const struct director *d, struct vsb *vsb)
 	VSB_printf(vsb, "port = %s,\n", bp->port);
 	VSB_printf(vsb, "hosthdr = %s,\n", bp->hosthdr);
 	VSB_printf(vsb, "health = %s,\n",
-	    bp->healthy ? "healthy" : "sick");
+	    bp->director->health ? "healthy" : "sick");
 	VSB_printf(vsb, "admin_health = %s, changed = %f,\n",
-	    VBE_AdminHealth(bp->admin_health), bp->health_changed);
+	    VBE_AdminHealth(bp->director->admin_health),
+	    bp->director->health_changed);
 	VSB_printf(vsb, "n_conn = %u,\n", bp->n_conn);
 }
 
diff --git a/bin/varnishd/cache/cache_backend.h b/bin/varnishd/cache/cache_backend.h
index 993aa4c..02e9bb0 100644
--- a/bin/varnishd/cache/cache_backend.h
+++ b/bin/varnishd/cache/cache_backend.h
@@ -62,9 +62,6 @@ struct backend {
 
 
 	struct vbp_target	*probe;
-	unsigned		healthy;
-	const struct vbe_ahealth *admin_health;
-	double			health_changed;
 
 	struct VSC_vbe		*vsc;
 
@@ -84,7 +81,6 @@ void VBE_fill_director(struct backend *be);
 
 /* cache_backend_cfg.c */
 void VBE_SetHappy(const struct backend *, uint64_t);
-unsigned VBE_Healthy(const struct backend *b, double *changed);
 void VBE_Delete(const struct director *);
 const char *VBE_AdminHealth(const struct vbe_ahealth *);
 
diff --git a/bin/varnishd/cache/cache_backend_cfg.c b/bin/varnishd/cache/cache_backend_cfg.c
index 5098810..18e5221 100644
--- a/bin/varnishd/cache/cache_backend_cfg.c
+++ b/bin/varnishd/cache/cache_backend_cfg.c
@@ -141,9 +141,11 @@ VRT_new_backend(VRT_CTX, const struct vrt_backend *vrt)
 	AN(b->display_name);
 	VSB_destroy(&vsb);
 
-	b->healthy = 1;
-	b->health_changed = VTIM_real();
-	b->admin_health = vbe_ah_probe;
+	VBE_fill_director(b);
+
+	b->director->health = 1;
+	b->director->health_changed = VTIM_real();
+	b->director->admin_health = vbe_ah_probe;
 
 	vbp = vrt->probe;
 	if (vbp == NULL)
@@ -156,8 +158,6 @@ VRT_new_backend(VRT_CTX, const struct vrt_backend *vrt)
 	    vbe_proto_ident);
 	Lck_Unlock(&backends_mtx);
 
-	VBE_fill_director(b);
-
 	if (vbp != NULL) {
 		VTP_AddRef(b->tcp_pool);
 		VBP_Insert(b, vbp, b->tcp_pool);
@@ -189,8 +189,8 @@ VRT_delete_backend(VRT_CTX, struct director **dp)
 	TAKE_OBJ_NOTNULL(d, dp, DIRECTOR_MAGIC);
 	CAST_OBJ_NOTNULL(be, d->priv, BACKEND_MAGIC);
 	Lck_Lock(&be->mtx);
-	be->admin_health = vbe_ah_deleted;
-	be->health_changed = VTIM_real();
+	be->director->admin_health = vbe_ah_deleted;
+	be->director->health_changed = VTIM_real();
 	be->cooled = VTIM_real() + 60.;
 	Lck_Unlock(&be->mtx);
 	Lck_Lock(&backends_mtx);
@@ -253,23 +253,23 @@ VBE_Delete(const struct director *d)
  */
 
 unsigned
-VBE_Healthy(const struct backend *backend, double *changed)
+VDI_Healthy(const struct director *d, double *changed)
 {
-	CHECK_OBJ_NOTNULL(backend, BACKEND_MAGIC);
+	CHECK_OBJ_NOTNULL(d, DIRECTOR_MAGIC);
 
 	if (changed != NULL)
-		*changed = backend->health_changed;
+		*changed = d->health_changed;
 
-	if (backend->admin_health == vbe_ah_probe)
-		return (backend->healthy);
+	if (d->admin_health == vbe_ah_probe)
+		return (d->health);
 
-	if (backend->admin_health == vbe_ah_sick)
+	if (d->admin_health == vbe_ah_sick)
 		return (0);
 
-	if (backend->admin_health == vbe_ah_deleted)
+	if (d->admin_health == vbe_ah_deleted)
 		return (0);
 
-	if (backend->admin_health == vbe_ah_healthy)
+	if (d->admin_health == vbe_ah_healthy)
 		return (1);
 
 	WRONG("Wrong admin health");
@@ -313,7 +313,7 @@ backend_find(struct cli *cli, const char *matcher, bf_func *func, void *priv)
 	AZ(VSB_finish(vsb));
 	Lck_Lock(&backends_mtx);
 	VTAILQ_FOREACH(b, &backends, list) {
-		if (b->admin_health == vbe_ah_deleted)
+		if (b->director->admin_health == vbe_ah_deleted)
 			continue;
 		if (fnmatch(VSB_data(vsb), b->display_name, 0))
 			continue;
@@ -344,19 +344,19 @@ do_list(struct cli *cli, struct backend *b, void *priv)
 
 	VCLI_Out(cli, "\n%-30s", b->display_name);
 
-	VCLI_Out(cli, " %-10s", VBE_AdminHealth(b->admin_health));
+	VCLI_Out(cli, " %-10s", VBE_AdminHealth(b->director->admin_health));
 
 	if (b->probe == NULL)
 		VCLI_Out(cli, " %-20s", "Healthy (no probe)");
 	else {
-		if (b->healthy)
+		if (b->director->health)
 			VCLI_Out(cli, " %-20s", "Healthy ");
 		else
 			VCLI_Out(cli, " %-20s", "Sick ");
 		VBP_Status(cli, b, *probes);
 	}
 
-	VTIM_format(b->health_changed, time_str);
+	VTIM_format(b->director->health_changed, time_str);
 	VCLI_Out(cli, " %s", time_str);
 
 	return (0);
@@ -399,11 +399,11 @@ do_set_health(struct cli *cli, struct backend *b, void *priv)
 	ah = *(const struct vbe_ahealth **)priv;
 	AN(ah);
 	CHECK_OBJ_NOTNULL(b, BACKEND_MAGIC);
-	prev = VBE_Healthy(b, NULL);
-	if (b->admin_health != vbe_ah_deleted)
-		b->admin_health = ah;
-	if (prev != VBE_Healthy(b, NULL))
-		b->health_changed = VTIM_real();
+	prev = VDI_Healthy(b->director, NULL);
+	if (b->director->admin_health != vbe_ah_deleted)
+		b->director->admin_health = ah;
+	if (prev != VDI_Healthy(b->director, NULL))
+		b->director->health_changed = VTIM_real();
 
 	return (0);
 }
diff --git a/bin/varnishd/cache/cache_backend_probe.c b/bin/varnishd/cache/cache_backend_probe.c
index aa176c0..66b0546 100644
--- a/bin/varnishd/cache/cache_backend_probe.c
+++ b/bin/varnishd/cache/cache_backend_probe.c
@@ -169,20 +169,22 @@ vbp_update_backend(struct vbp_target *vt)
 		assert(i < sizeof bits);
 
 		if (vt->good >= vt->threshold) {
-			if (vt->backend->healthy)
+			if (vt->backend->director->health)
 				logmsg = "Still healthy";
 			else {
 				logmsg = "Back healthy";
-				vt->backend->health_changed = VTIM_real();
+				vt->backend->director->health_changed =
+				     VTIM_real();
 			}
-			vt->backend->healthy = 1;
+			vt->backend->director->health = 1;
 		} else {
-			if (vt->backend->healthy) {
+			if (vt->backend->director->health) {
 				logmsg = "Went sick";
-				vt->backend->health_changed = VTIM_real();
+				vt->backend->director->health_changed =
+				     VTIM_real();
 			} else
 				logmsg = "Still sick";
-			vt->backend->healthy = 0;
+			vt->backend->director->health = 0;
 		}
 		VSL(SLT_Backend_health, 0, "%s %s %s %u %u %u %.6f %.6f %s",
 		    vt->backend->display_name, logmsg, bits,
@@ -635,7 +637,7 @@ VBP_Remove(struct backend *be)
 	CHECK_OBJ_NOTNULL(vt, VBP_TARGET_MAGIC);
 
 	Lck_Lock(&vbp_mtx);
-	be->healthy = 1;
+	be->director->health = 1;
 	be->probe = NULL;
 	vt->backend = NULL;
 	if (vt->running) {
diff --git a/bin/varnishd/cache/cache_director.h b/bin/varnishd/cache/cache_director.h
index 9d7a6b9..2b283e0 100644
--- a/bin/varnishd/cache/cache_director.h
+++ b/bin/varnishd/cache/cache_director.h
@@ -78,6 +78,13 @@ struct director {
 	const void		*priv2;
 
 	/* Internal Housekeeping fields */
+
 	VTAILQ_ENTRY(director)	list;
 	struct vcl		*vcl;
+
+	unsigned		health;
+	const struct vbe_ahealth *admin_health;
+	double			health_changed;
 };
+
+unsigned VDI_Healthy(const struct director *, double *);

From phk at FreeBSD.org  Tue Nov 14 09:31:11 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Tue, 14 Nov 2017 09:31:11 +0000 (UTC)
Subject: [master] 5b81596 Enforce admin health at director level
Message-ID: <20171114093111.3C784630E3@lists.varnish-cache.org>


commit 5b81596eb498a33b6ec17caa83ca1087ecbf7afc
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Nov 14 09:27:00 2017 +0000

    Enforce admin health at director level

diff --git a/bin/varnishd/cache/cache_director.c b/bin/varnishd/cache/cache_director.c
index 563f46c..51d2dd3 100644
--- a/bin/varnishd/cache/cache_director.c
+++ b/bin/varnishd/cache/cache_director.c
@@ -172,16 +172,18 @@ VDI_Http1Pipe(struct req *req, struct busyobj *bo)
  */
 
 int
-VRT_Healthy(VRT_CTX, VCL_BACKEND be)
+VRT_Healthy(VRT_CTX, VCL_BACKEND d)
 {
 
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
-	if (be == NULL)
+	if (d == NULL)
+		return (0);
+	CHECK_OBJ_NOTNULL(d, DIRECTOR_MAGIC);
+	if (!VDI_Healthy(d, NULL))
 		return (0);
-	CHECK_OBJ_NOTNULL(be, DIRECTOR_MAGIC);
-	if (be->healthy == NULL)
+	if (d->healthy == NULL)
 		return (1);
-	return (be->healthy(be, ctx->bo, NULL));
+	return (d->healthy(d, ctx->bo, NULL));
 }
 
 /* Send Event ----------------------------------------------------------

From nils.goroll at uplex.de  Tue Nov 14 09:39:04 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Tue, 14 Nov 2017 09:39:04 +0000 (UTC)
Subject: [master] 1369692 Fix wb_create used by vmod_blob: WS_Reserve of 0
 bytes still leaves a reservation
Message-ID: <20171114093904.E4B4263CB4@lists.varnish-cache.org>


commit 13696927680275144a88767cdd70854d369b2e1c
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Tue Nov 14 10:18:49 2017 +0100

    Fix wb_create used by vmod_blob: WS_Reserve of 0 bytes still leaves a reservation
    
    If workspace was exhausted, vmod_blob would fail yet still leave a
    reservation which would likely trigger a WS_Reserve() assertion
    failure in later code trying to reserve the workspace.
    
    Fixes #2488
    
    Thank you to @jarro2783 for the report and @dridi for the analysis.

diff --git a/bin/varnishtest/tests/r02488.vtc b/bin/varnishtest/tests/r02488.vtc
new file mode 100644
index 0000000..11844a6
--- /dev/null
+++ b/bin/varnishtest/tests/r02488.vtc
@@ -0,0 +1,41 @@
+varnishtest "Test vmod_blob wb_create for empty workspace"
+
+varnish v1 -vcl {
+	import blob;
+	import vtc;
+
+	backend b1 {.host = "${bad_backend}";}
+
+	sub vcl_init {
+		new bl = blob.blob(HEX, "deadbeef");
+	}
+	sub vcl_recv {
+		return (synth(200));
+	}
+	sub vcl_synth {
+		if (req.url == "/empty") {
+			vtc.workspace_alloc(client, -1);
+		}
+		set resp.http.foo = blob.encode(encoding=HEX, blob=bl.get());
+		set resp.http.bar = "bar";
+	}
+} -start
+
+logexpect l1 -v v1 -g raw {
+	expect * 1002 VCL_call	{^SYNTH$}
+	expect 0    = VCL_Error	{^vmod blob error: cannot encode, out of space$}
+	expect 0    = LostHeader	{^foo:$}
+	expect 0    = VCL_return	{^fail$}
+} -start
+
+client c1 {
+	txreq
+	rxresp
+	expect resp.http.foo == "deadbeef"
+	expect resp.http.bar == "bar"
+
+	txreq -url "/empty"
+	expect_close
+} -run
+
+logexpect l1 -wait
diff --git a/lib/libvmod_blob/wb.c b/lib/libvmod_blob/wb.c
index d56b061..304b12e 100644
--- a/lib/libvmod_blob/wb.c
+++ b/lib/libvmod_blob/wb.c
@@ -35,6 +35,7 @@ char *
 wb_create(struct ws *ws, struct wb_s *wb)
 {
 	if (WS_Reserve(ws, 0) == 0) {
+		WS_Release(ws, 0);
 		wb->w = NULL;
 		wb->ws = NULL;
 		return NULL;

From dridi.boukelmoune at gmail.com  Tue Nov 14 09:54:05 2017
From: dridi.boukelmoune at gmail.com (Dridi Boukelmoune)
Date: Tue, 14 Nov 2017 09:54:05 +0000 (UTC)
Subject: [master] a0a3299 VRT book keeping
Message-ID: <20171114095405.72CF7642EA@lists.varnish-cache.org>


commit a0a3299b2c5fbe4036f1cb657bd01796bd07df04
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Tue Nov 14 10:52:27 2017 +0100

    VRT book keeping
    
    The documentation on directors needs an update too.

diff --git a/include/vrt.h b/include/vrt.h
index 2c661a0..76aae7e 100644
--- a/include/vrt.h
+++ b/include/vrt.h
@@ -56,6 +56,8 @@
  *	VRT_Healthy() added
  *	VRT_VSC_Alloc() added
  *	VRT_VSC_Destroy() added
+ *	struct director.event added
+ *	struct director.destroy added
  * 6.1 (2017-09-15 aka 5.2)
  *	http_CollectHdrSep added
  *	VRT_purge modified (may fail a transaction, signature changed)

From phk at FreeBSD.org  Tue Nov 14 10:11:04 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Tue, 14 Nov 2017 10:11:04 +0000 (UTC)
Subject: [master] c39eb64 Lift display_name up from vbe to vdi
Message-ID: <20171114101104.655F76494F@lists.varnish-cache.org>


commit c39eb640a28746a9704e09c11fca16e4a237cb06
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Nov 14 09:50:26 2017 +0000

    Lift display_name up from vbe to vdi

diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c
index 94739eb..5bede5c 100644
--- a/bin/varnishd/cache/cache_backend.c
+++ b/bin/varnishd/cache/cache_backend.c
@@ -77,7 +77,7 @@ vbe_dir_getfd(struct worker *wrk, struct backend *bp, struct busyobj *bo)
 
 	if (!VDI_Healthy(bp->director, NULL)) {
 		VSLb(bo->vsl, SLT_FetchError,
-		     "backend %s: unhealthy", bp->display_name);
+		     "backend %s: unhealthy", bp->director->display_name);
 		// XXX: per backend stats ?
 		VSC_C_main->backend_unhealthy++;
 		return (NULL);
@@ -85,7 +85,7 @@ vbe_dir_getfd(struct worker *wrk, struct backend *bp, struct busyobj *bo)
 
 	if (bp->max_connections > 0 && bp->n_conn >= bp->max_connections) {
 		VSLb(bo->vsl, SLT_FetchError,
-		     "backend %s: busy", bp->display_name);
+		     "backend %s: busy", bp->director->display_name);
 		// XXX: per backend stats ?
 		VSC_C_main->backend_busy++;
 		return (NULL);
@@ -104,7 +104,7 @@ vbe_dir_getfd(struct worker *wrk, struct backend *bp, struct busyobj *bo)
 	vtp = VTP_Get(bp->tcp_pool, tmod, wrk);
 	if (vtp == NULL) {
 		VSLb(bo->vsl, SLT_FetchError,
-		     "backend %s: fail", bp->display_name);
+		     "backend %s: fail", bp->director->display_name);
 		// XXX: Per backend stats ?
 		VSC_C_main->backend_fail++;
 		bo->htc = NULL;
@@ -126,7 +126,7 @@ vbe_dir_getfd(struct worker *wrk, struct backend *bp, struct busyobj *bo)
 	VTCP_myname(vtp->fd, abuf1, sizeof abuf1, pbuf1, sizeof pbuf1);
 	VTCP_hisname(vtp->fd, abuf2, sizeof abuf2, pbuf2, sizeof pbuf2);
 	VSLb(bo->vsl, SLT_BackendOpen, "%d %s %s %s %s %s",
-	    vtp->fd, bp->display_name, abuf2, pbuf2, abuf1, pbuf1);
+	    vtp->fd, bp->director->display_name, abuf2, pbuf2, abuf1, pbuf1);
 
 	INIT_OBJ(bo->htc, HTTP_CONN_MAGIC);
 	bo->htc->priv = vtp;
@@ -169,12 +169,12 @@ vbe_dir_finish(const struct director *d, struct worker *wrk,
 		VTP_Wait(wrk, vtp);
 	if (bo->htc->doclose != SC_NULL || bp->proxy_header != 0) {
 		VSLb(bo->vsl, SLT_BackendClose, "%d %s", vtp->fd,
-		    bp->display_name);
+		    bp->director->display_name);
 		VTP_Close(&vtp);
 		Lck_Lock(&bp->mtx);
 	} else {
 		VSLb(bo->vsl, SLT_BackendReuse, "%d %s", vtp->fd,
-		    bp->display_name);
+		    bp->director->display_name);
 		Lck_Lock(&bp->mtx);
 		VSC_C_main->backend_recycle++;
 		VTP_Recycle(wrk, &vtp);
@@ -318,7 +318,7 @@ vbe_dir_event(const struct director *d, enum vcl_event_e ev)
 
 	if (ev == VCL_EVENT_WARM) {
 		AZ(bp->vsc);
-		bp->vsc = VSC_vbe_New(bp->display_name);
+		bp->vsc = VSC_vbe_New(bp->director->display_name);
 		AN(bp->vsc);
 	}
 
@@ -345,7 +345,7 @@ vbe_panic(const struct director *d, struct vsb *vsb)
 	CHECK_OBJ_NOTNULL(d, DIRECTOR_MAGIC);
 	CAST_OBJ_NOTNULL(bp, d->priv, BACKEND_MAGIC);
 
-	VSB_printf(vsb, "display_name = %s,\n", bp->display_name);
+	VSB_printf(vsb, "display_name = %s,\n", bp->director->display_name);
 	if (bp->ipv4_addr != NULL)
 		VSB_printf(vsb, "ipv4 = %s,\n", bp->ipv4_addr);
 	if (bp->ipv6_addr != NULL)
diff --git a/bin/varnishd/cache/cache_backend.h b/bin/varnishd/cache/cache_backend.h
index 02e9bb0..a9f2901 100644
--- a/bin/varnishd/cache/cache_backend.h
+++ b/bin/varnishd/cache/cache_backend.h
@@ -58,9 +58,6 @@ struct backend {
 
 	VRT_BACKEND_FIELDS()
 
-	char			*display_name;
-
-
 	struct vbp_target	*probe;
 
 	struct VSC_vbe		*vsc;
@@ -90,7 +87,3 @@ void VBP_Insert(struct backend *b, struct vrt_backend_probe const *p,
 void VBP_Remove(struct backend *b);
 void VBP_Control(const struct backend *b, int stop);
 void VBP_Status(struct cli *cli, const struct backend *, int details);
-
-/* cache_vcl.c */
-int VCL_AddBackend(struct vcl *, struct director *);
-void VCL_DelBackend(const struct director *);
diff --git a/bin/varnishd/cache/cache_backend_cfg.c b/bin/varnishd/cache/cache_backend_cfg.c
index 18e5221..3a77d88 100644
--- a/bin/varnishd/cache/cache_backend_cfg.c
+++ b/bin/varnishd/cache/cache_backend_cfg.c
@@ -108,7 +108,6 @@ VRT_new_backend(VRT_CTX, const struct vrt_backend *vrt)
 {
 	struct backend *b;
 	struct director *d;
-	struct vsb *vsb;
 	struct vcl *vcl;
 	const struct vrt_backend_probe *vbp;
 	int retval;
@@ -132,15 +131,6 @@ VRT_new_backend(VRT_CTX, const struct vrt_backend *vrt)
 #undef DA
 #undef DN
 
-	vsb = VSB_new_auto();
-	AN(vsb);
-	VSB_printf(vsb, "%s.%s", VCL_Name(vcl), vrt->vcl_name);
-	AZ(VSB_finish(vsb));
-
-	b->display_name = strdup(VSB_data(vsb));
-	AN(b->display_name);
-	VSB_destroy(&vsb);
-
 	VBE_fill_director(b);
 
 	b->director->health = 1;
@@ -163,7 +153,7 @@ VRT_new_backend(VRT_CTX, const struct vrt_backend *vrt)
 		VBP_Insert(b, vbp, b->tcp_pool);
 	}
 
-	retval = VCL_AddBackend(ctx->vcl, b->director);
+	retval = VCL_AddDirector(ctx->vcl, b->director, vrt->vcl_name);
 
 	if (retval == 0)
 		return (b->director);
@@ -242,7 +232,6 @@ VBE_Delete(const struct director *d)
 #undef DA
 #undef DN
 
-	free(be->display_name);
 	AZ(be->vsc);
 	Lck_Delete(&be->mtx);
 	FREE_OBJ(be);
@@ -315,7 +304,7 @@ backend_find(struct cli *cli, const char *matcher, bf_func *func, void *priv)
 	VTAILQ_FOREACH(b, &backends, list) {
 		if (b->director->admin_health == vbe_ah_deleted)
 			continue;
-		if (fnmatch(VSB_data(vsb), b->display_name, 0))
+		if (fnmatch(VSB_data(vsb), b->director->display_name, 0))
 			continue;
 		found++;
 		i = func(cli, b, priv);
@@ -342,7 +331,7 @@ do_list(struct cli *cli, struct backend *b, void *priv)
 	probes = priv;
 	CHECK_OBJ_NOTNULL(b, BACKEND_MAGIC);
 
-	VCLI_Out(cli, "\n%-30s", b->display_name);
+	VCLI_Out(cli, "\n%-30s", b->director->display_name);
 
 	VCLI_Out(cli, " %-10s", VBE_AdminHealth(b->director->admin_health));
 
@@ -457,7 +446,7 @@ VBE_Poll(void)
 		if (be->n_conn > 0)
 			continue;
 		Lck_Unlock(&backends_mtx);
-		VCL_DelBackend(be->director);
+		VCL_DelDirector(be->director);
 		Lck_Lock(&backends_mtx);
 	}
 	Lck_Unlock(&backends_mtx);
diff --git a/bin/varnishd/cache/cache_backend_probe.c b/bin/varnishd/cache/cache_backend_probe.c
index 66b0546..26e14b1 100644
--- a/bin/varnishd/cache/cache_backend_probe.c
+++ b/bin/varnishd/cache/cache_backend_probe.c
@@ -187,7 +187,7 @@ vbp_update_backend(struct vbp_target *vt)
 			vt->backend->director->health = 0;
 		}
 		VSL(SLT_Backend_health, 0, "%s %s %s %u %u %u %.6f %.6f %s",
-		    vt->backend->display_name, logmsg, bits,
+		    vt->backend->director->display_name, logmsg, bits,
 		    vt->good, vt->threshold, vt->window,
 		    vt->last, vt->avg, vt->resp_buf);
 		VBE_SetHappy(vt->backend, vt->happy);
diff --git a/bin/varnishd/cache/cache_director.h b/bin/varnishd/cache/cache_director.h
index 2b283e0..5743c94 100644
--- a/bin/varnishd/cache/cache_director.h
+++ b/bin/varnishd/cache/cache_director.h
@@ -79,6 +79,7 @@ struct director {
 
 	/* Internal Housekeeping fields */
 
+	char			*display_name;
 	VTAILQ_ENTRY(director)	list;
 	struct vcl		*vcl;
 
@@ -88,3 +89,7 @@ struct director {
 };
 
 unsigned VDI_Healthy(const struct director *, double *);
+
+/* cache_vcl.c */
+int VCL_AddDirector(struct vcl *, struct director *, const char *);
+void VCL_DelDirector(struct director *);
diff --git a/bin/varnishd/cache/cache_vcl.c b/bin/varnishd/cache/cache_vcl.c
index 409249c..e3977da 100644
--- a/bin/varnishd/cache/cache_vcl.c
+++ b/bin/varnishd/cache/cache_vcl.c
@@ -327,13 +327,21 @@ VCL_Rel(struct vcl **vcc)
 /*--------------------------------------------------------------------*/
 
 int
-VCL_AddBackend(struct vcl *vcl, struct director *d)
+VCL_AddDirector(struct vcl *vcl, struct director *d, const char *vcl_name)
 {
+	struct vsb *vsb;
 
 	CHECK_OBJ_NOTNULL(vcl, VCL_MAGIC);
 	CHECK_OBJ_NOTNULL(d, DIRECTOR_MAGIC);
 	AN(d->destroy);
 
+	vsb = VSB_new_auto();
+	AN(vsb);
+	VSB_printf(vsb, "%s.%s", VCL_Name(vcl), vcl_name);
+	AZ(VSB_finish(vsb));
+	REPLACE((d->display_name), VSB_data(vsb));
+	VSB_destroy(&vsb);
+
 	AZ(errno=pthread_rwlock_rdlock(&vcl->temp_rwl));
 	if (vcl->temp == VCL_TEMP_COOLING) {
 		AZ(errno=pthread_rwlock_unlock(&vcl->temp_rwl));
@@ -356,7 +364,7 @@ VCL_AddBackend(struct vcl *vcl, struct director *d)
 }
 
 void
-VCL_DelBackend(const struct director *d)
+VCL_DelDirector(struct director *d)
 {
 	struct vcl *vcl;
 
@@ -372,6 +380,7 @@ VCL_DelBackend(const struct director *d)
 		VDI_Event(d, VCL_EVENT_COLD);
 	AZ(errno=pthread_rwlock_unlock(&vcl->temp_rwl));
 	AN(d->destroy);
+	REPLACE(d->display_name, NULL);
 	d->destroy(d);
 }
 

From phk at FreeBSD.org  Tue Nov 14 10:11:04 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Tue, 14 Nov 2017 10:11:04 +0000 (UTC)
Subject: [master] 8966942 Rename list to vcl_list
Message-ID: <20171114101104.7BAE964952@lists.varnish-cache.org>


commit 896694276723c1612efd616589dcff9dda51b514
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Nov 14 09:56:43 2017 +0000

    Rename list to vcl_list

diff --git a/bin/varnishd/cache/cache_director.h b/bin/varnishd/cache/cache_director.h
index 5743c94..360da41 100644
--- a/bin/varnishd/cache/cache_director.h
+++ b/bin/varnishd/cache/cache_director.h
@@ -80,7 +80,7 @@ struct director {
 	/* Internal Housekeeping fields */
 
 	char			*display_name;
-	VTAILQ_ENTRY(director)	list;
+	VTAILQ_ENTRY(director)	vcl_list;
 	struct vcl		*vcl;
 
 	unsigned		health;
diff --git a/bin/varnishd/cache/cache_vcl.c b/bin/varnishd/cache/cache_vcl.c
index e3977da..36b64c5 100644
--- a/bin/varnishd/cache/cache_vcl.c
+++ b/bin/varnishd/cache/cache_vcl.c
@@ -349,7 +349,7 @@ VCL_AddDirector(struct vcl *vcl, struct director *d, const char *vcl_name)
 	}
 
 	Lck_Lock(&vcl_mtx);
-	VTAILQ_INSERT_TAIL(&vcl->director_list, d, list);
+	VTAILQ_INSERT_TAIL(&vcl->director_list, d, vcl_list);
 	d->vcl = vcl;
 	Lck_Unlock(&vcl_mtx);
 
@@ -372,7 +372,7 @@ VCL_DelDirector(struct director *d)
 	vcl = d->vcl;
 	CHECK_OBJ_NOTNULL(vcl, VCL_MAGIC);
 	Lck_Lock(&vcl_mtx);
-	VTAILQ_REMOVE(&vcl->director_list, d, list);
+	VTAILQ_REMOVE(&vcl->director_list, d, vcl_list);
 	Lck_Unlock(&vcl_mtx);
 
 	AZ(errno=pthread_rwlock_rdlock(&vcl->temp_rwl));
@@ -393,7 +393,7 @@ vcl_BackendEvent(const struct vcl *vcl, enum vcl_event_e e)
 	CHECK_OBJ_NOTNULL(vcl, VCL_MAGIC);
 	AZ(vcl->busy);
 
-	VTAILQ_FOREACH(d, &vcl->director_list, list)
+	VTAILQ_FOREACH(d, &vcl->director_list, vcl_list)
 		VDI_Event(d, e);
 }
 
@@ -409,7 +409,7 @@ vcl_KillBackends(struct vcl *vcl)
 		d = VTAILQ_FIRST(&vcl->director_list);
 		if (d == NULL)
 			break;
-		VTAILQ_REMOVE(&vcl->director_list, d, list);
+		VTAILQ_REMOVE(&vcl->director_list, d, vcl_list);
 		AN(d->destroy);
 		d->destroy(d);
 	}

From martin at varnish-software.com  Tue Nov 14 10:16:04 2017
From: martin at varnish-software.com (Martin Blix Grydeland)
Date: Tue, 14 Nov 2017 10:16:04 +0000 (UTC)
Subject: [master] 8f4ff7a Use the idle read timeout only on empty requests
Message-ID: <20171114101604.A227065994@lists.varnish-cache.org>


commit 8f4ff7af3cced99f777087c7525d9a5bb9edf661
Author: Martin Blix Grydeland <martin at varnish-software.com>
Date:   Mon Nov 13 15:51:11 2017 +0100

    Use the idle read timeout only on empty requests
    
    We only want to return the connection early to the waiter when the
    request is empty. Correct the read timeout calculation to reflect
    that.
    
    Thanks to Stackpath for helping to debug this issue.
    
    Fixes: #2492

diff --git a/bin/varnishd/cache/cache_session.c b/bin/varnishd/cache/cache_session.c
index 455788b..0ddd0f5 100644
--- a/bin/varnishd/cache/cache_session.c
+++ b/bin/varnishd/cache/cache_session.c
@@ -290,7 +290,7 @@ HTC_RxStuff(struct http_conn *htc, htc_complete_f *func,
 			WRONG("htc_status_e");
 
 		tmo = tn - now;
-		if (!isnan(ti) && ti < tn)
+		if (!isnan(ti) && ti < tn && hs == HTC_S_EMPTY)
 			tmo = ti - now;
 		z = maxbytes - (htc->rxbuf_e - htc->rxbuf_b);
 		assert(z >= 0);

From martin at varnish-software.com  Tue Nov 14 10:24:05 2017
From: martin at varnish-software.com (Martin Blix Grydeland)
Date: Tue, 14 Nov 2017 10:24:05 +0000 (UTC)
Subject: [master] ce3c13b Add a test case for #2429
Message-ID: <20171114102405.7BD9765D1D@lists.varnish-cache.org>


commit ce3c13b5f43ff76e8f6b9f11141cb8a143546b7b
Author: Martin Blix Grydeland <martin at varnish-software.com>
Date:   Tue Nov 14 11:23:15 2017 +0100

    Add a test case for #2429

diff --git a/bin/varnishtest/tests/r02429.vtc b/bin/varnishtest/tests/r02429.vtc
new file mode 100644
index 0000000..02c8450
--- /dev/null
+++ b/bin/varnishtest/tests/r02429.vtc
@@ -0,0 +1,20 @@
+varnishtest "#2429 file stevedore error buffer regression test"
+
+server s1 {
+	accept
+} -start
+
+varnish v1 -arg "-s Transient=file,${tmpdir}/_.file,1m" -vcl+backend {
+	sub vcl_backend_error {
+		synthetic("foo");
+		return (deliver);
+	}
+} -start
+
+client c1 {
+	txreq
+	rxresp
+	expect resp.status == 503
+	expect resp.http.content-length == 3
+	expect resp.body == "foo"
+} -run

From martin at varnish-software.com  Tue Nov 14 10:51:05 2017
From: martin at varnish-software.com (Martin Blix Grydeland)
Date: Tue, 14 Nov 2017 10:51:05 +0000 (UTC)
Subject: [4.1] 0d6d6cb Use the idle read timeout only on empty requests
Message-ID: <20171114105105.1052763854@lists.varnish-cache.org>


commit 0d6d6cbf2e83a0c1cea8a353b5920fc6d186f9b7
Author: Martin Blix Grydeland <martin at varnish-software.com>
Date:   Mon Nov 13 15:51:11 2017 +0100

    Use the idle read timeout only on empty requests
    
    We only want to return the connection early to the waiter when the
    request is empty. Correct the read timeout calculation to reflect
    that.
    
    Thanks to Stackpath for helping to debug this issue.
    
    Fixes: #2492

diff --git a/bin/varnishd/cache/cache_session.c b/bin/varnishd/cache/cache_session.c
index 8c9c3b6..8ab7d51 100644
--- a/bin/varnishd/cache/cache_session.c
+++ b/bin/varnishd/cache/cache_session.c
@@ -244,7 +244,7 @@ SES_RxStuff(struct http_conn *htc, htc_complete_f *func,
 			WRONG("htc_status_e");
 
 		tmo = tn - now;
-		if (!isnan(ti) && ti < tn)
+		if (!isnan(ti) && ti < tn && hs == HTC_S_EMPTY)
 			tmo = ti - now;
 		i = (htc->ws->r - htc->rxbuf_e) - 1;	/* space for NUL */
 		if (i <= 0) {

From martin at varnish-software.com  Tue Nov 14 10:51:05 2017
From: martin at varnish-software.com (Martin Blix Grydeland)
Date: Tue, 14 Nov 2017 10:51:05 +0000 (UTC)
Subject: [4.1] 594187f Add a test case for #2429
Message-ID: <20171114105105.2735863857@lists.varnish-cache.org>


commit 594187fa086cea506ce580843356ab6e75d08975
Author: Martin Blix Grydeland <martin at varnish-software.com>
Date:   Tue Nov 14 11:23:15 2017 +0100

    Add a test case for #2429

diff --git a/bin/varnishtest/tests/r02429.vtc b/bin/varnishtest/tests/r02429.vtc
new file mode 100644
index 0000000..02c8450
--- /dev/null
+++ b/bin/varnishtest/tests/r02429.vtc
@@ -0,0 +1,20 @@
+varnishtest "#2429 file stevedore error buffer regression test"
+
+server s1 {
+	accept
+} -start
+
+varnish v1 -arg "-s Transient=file,${tmpdir}/_.file,1m" -vcl+backend {
+	sub vcl_backend_error {
+		synthetic("foo");
+		return (deliver);
+	}
+} -start
+
+client c1 {
+	txreq
+	rxresp
+	expect resp.status == 503
+	expect resp.http.content-length == 3
+	expect resp.body == "foo"
+} -run

From martin at varnish-software.com  Tue Nov 14 10:51:05 2017
From: martin at varnish-software.com (Martin Blix Grydeland)
Date: Tue, 14 Nov 2017 10:51:05 +0000 (UTC)
Subject: [4.1] 8ea4f63 Update changelog
Message-ID: <20171114105105.434D76385B@lists.varnish-cache.org>


commit 8ea4f63d363ccce9608e1a724c838aa9648b4d19
Author: Martin Blix Grydeland <martin at varnish-software.com>
Date:   Tue Nov 14 11:33:28 2017 +0100

    Update changelog

diff --git a/doc/changes.rst b/doc/changes.rst
index bfd7cff..266f575 100644
--- a/doc/changes.rst
+++ b/doc/changes.rst
@@ -22,7 +22,8 @@ Bugs fixed
 * 2373_ - VSC n_vcl, n_vcl_avail, n_vcl_discard are gauge
 * 2380_ - Correct regexp in examples.
 * 2390_ - Straighten locking wrt vcl_active
-* 2429_ - Avoid buffer read overflow on vcl_error and -sfile
+* 2429_ - Avoid buffer read overflow on vcl_backend_error and -sfile
+* 2492_ - Use the idle read timeout only on empty requests
 
 .. _2337: https://github.com/varnishcache/varnish-cache/issues/2337
 .. _2366: https://github.com/varnishcache/varnish-cache/issues/2366
@@ -31,6 +32,7 @@ Bugs fixed
 .. _2380: https://github.com/varnishcache/varnish-cache/issues/2380
 .. _2390: https://github.com/varnishcache/varnish-cache/issues/2390
 .. _2429: https://github.com/varnishcache/varnish-cache/pull/2429
+.. _2492: https://github.com/varnishcache/varnish-cache/issues/2492
 
 ================================
 Varnish Cache 4.1.8 (2017-08-02)

From phk at FreeBSD.org  Tue Nov 14 11:31:06 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Tue, 14 Nov 2017 11:31:06 +0000 (UTC)
Subject: [master] b9eaa41 Add VCL_IterDirector() for CLI to iterate over
 backends.
Message-ID: <20171114113106.A41EF61B60@lists.varnish-cache.org>


commit b9eaa410c415786e9df1081dd8a7f0f6cc56aff6
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Nov 14 11:29:27 2017 +0000

    Add VCL_IterDirector() for CLI to iterate over backends.
    
    (Replaces cache_backend_cfg.c::backend_find)

diff --git a/bin/varnishd/cache/cache_backend_cfg.c b/bin/varnishd/cache/cache_backend_cfg.c
index 3a77d88..733975c 100644
--- a/bin/varnishd/cache/cache_backend_cfg.c
+++ b/bin/varnishd/cache/cache_backend_cfg.c
@@ -196,10 +196,10 @@ void
 VBE_SetHappy(const struct backend *be, uint64_t happy)
 {
 
-		Lck_Lock(&backends_mtx);
-		if (be->vsc != NULL)
-			be->vsc->happy = happy;
-		Lck_Unlock(&backends_mtx);
+	Lck_Lock(&backends_mtx);
+	if (be->vsc != NULL)
+		be->vsc->happy = happy;
+	Lck_Unlock(&backends_mtx);
 }
 
 /*---------------------------------------------------------------------
@@ -264,88 +264,37 @@ VDI_Healthy(const struct director *d, double *changed)
 	WRONG("Wrong admin health");
 }
 
-/*---------------------------------------------------------------------
- * A general function for finding backends and doing things with them.
- *
- * Return -1 on match-argument parse errors.
- *
- * If the call-back function returns negative, the search is terminated
- * and we relay that return value.
- *
- * Otherwise we return the number of matches.
- */
-
-typedef int bf_func(struct cli *cli, struct backend *b, void *priv);
-
-static int
-backend_find(struct cli *cli, const char *matcher, bf_func *func, void *priv)
-{
-	int i, found = 0;
-	struct vsb *vsb;
-	struct vcl *vcc = NULL;
-	struct backend *b;
-
-	VCL_Refresh(&vcc);
-	AN(vcc);
-	vsb = VSB_new_auto();
-	AN(vsb);
-	if (matcher == NULL || *matcher == '\0' || !strcmp(matcher, "*")) {
-		// all backends in active VCL
-		VSB_printf(vsb, "%s.*", VCL_Name(vcc));
-	} else if (strchr(matcher, '.') != NULL) {
-		// use pattern as is
-		VSB_cat(vsb, matcher);
-	} else {
-		// pattern applies to active vcl
-		VSB_printf(vsb, "%s.%s", VCL_Name(vcc), matcher);
-	}
-	AZ(VSB_finish(vsb));
-	Lck_Lock(&backends_mtx);
-	VTAILQ_FOREACH(b, &backends, list) {
-		if (b->director->admin_health == vbe_ah_deleted)
-			continue;
-		if (fnmatch(VSB_data(vsb), b->director->display_name, 0))
-			continue;
-		found++;
-		i = func(cli, b, priv);
-		if (i < 0) {
-			found = i;
-			break;
-		}
-	}
-	Lck_Unlock(&backends_mtx);
-	VSB_destroy(&vsb);
-	VCL_Rel(&vcc);
-	return (found);
-}
-
 /*---------------------------------------------------------------------*/
 
-static int __match_proto__()
-do_list(struct cli *cli, struct backend *b, void *priv)
+static int __match_proto__(vcl_be_func)
+do_list(struct cli *cli, struct director *d, void *priv)
 {
 	int *probes;
 	char time_str[VTIM_FORMAT_SIZE];
+	struct backend *be;
 
 	AN(priv);
 	probes = priv;
-	CHECK_OBJ_NOTNULL(b, BACKEND_MAGIC);
+	CHECK_OBJ_NOTNULL(d, DIRECTOR_MAGIC);
+	CAST_OBJ_NOTNULL(be, d->priv, BACKEND_MAGIC);
+	if (d->admin_health == vbe_ah_deleted)
+		return (0);
 
-	VCLI_Out(cli, "\n%-30s", b->director->display_name);
+	VCLI_Out(cli, "\n%-30s", d->display_name);
 
-	VCLI_Out(cli, " %-10s", VBE_AdminHealth(b->director->admin_health));
+	VCLI_Out(cli, " %-10s", VBE_AdminHealth(d->admin_health));
 
-	if (b->probe == NULL)
+	if (be->probe == NULL)
 		VCLI_Out(cli, " %-20s", "Healthy (no probe)");
 	else {
-		if (b->director->health)
+		if (d->health)
 			VCLI_Out(cli, " %-20s", "Healthy ");
 		else
 			VCLI_Out(cli, " %-20s", "Sick ");
-		VBP_Status(cli, b, *probes);
+		VBP_Status(cli, be, *probes);
 	}
 
-	VTIM_format(b->director->health_changed, time_str);
+	VTIM_format(d->health_changed, time_str);
 	VCLI_Out(cli, " %s", time_str);
 
 	return (0);
@@ -372,27 +321,29 @@ cli_backend_list(struct cli *cli, const char * const *av, void *priv)
 	}
 	VCLI_Out(cli, "%-30s %-10s %-20s %s", "Backend name", "Admin",
 	    "Probe", "Last updated");
-	(void)backend_find(cli, av[2], do_list, &probes);
+	(void)VCL_IterDirector(cli, av[2], do_list, &probes);
 }
 
 /*---------------------------------------------------------------------*/
 
-static int __match_proto__()
-do_set_health(struct cli *cli, struct backend *b, void *priv)
+static int __match_proto__(vcl_be_func)
+do_set_health(struct cli *cli, struct director *d, void *priv)
 {
 	const struct vbe_ahealth *ah;
 	unsigned prev;
 
 	(void)cli;
 	AN(priv);
+	CHECK_OBJ_NOTNULL(d, DIRECTOR_MAGIC);
+	if (d->admin_health == vbe_ah_deleted)
+		return (0);
 	ah = *(const struct vbe_ahealth **)priv;
 	AN(ah);
-	CHECK_OBJ_NOTNULL(b, BACKEND_MAGIC);
-	prev = VDI_Healthy(b->director, NULL);
-	if (b->director->admin_health != vbe_ah_deleted)
-		b->director->admin_health = ah;
-	if (prev != VDI_Healthy(b->director, NULL))
-		b->director->health_changed = VTIM_real();
+	prev = VDI_Healthy(d, NULL);
+	if (d->admin_health != vbe_ah_deleted)
+		d->admin_health = ah;
+	if (prev != VDI_Healthy(d, NULL))
+		d->health_changed = VTIM_real();
 
 	return (0);
 }
@@ -414,7 +365,7 @@ cli_backend_set_health(struct cli *cli, const char * const *av, void *priv)
 		VCLI_SetResult(cli, CLIS_PARAM);
 		return;
 	}
-	n = backend_find(cli, av[2], do_set_health, &ah);
+	n = VCL_IterDirector(cli, av[2], do_set_health, &ah);
 	if (n == 0) {
 		VCLI_Out(cli, "No Backends matches");
 		VCLI_SetResult(cli, CLIS_PARAM);
diff --git a/bin/varnishd/cache/cache_varnishd.h b/bin/varnishd/cache/cache_varnishd.h
index 61bd187..b7fb23c 100644
--- a/bin/varnishd/cache/cache_varnishd.h
+++ b/bin/varnishd/cache/cache_varnishd.h
@@ -214,6 +214,9 @@ void VCL_Refresh(struct vcl **);
 void VCL_Rel(struct vcl **);
 const char *VCL_Return_Name(unsigned);
 
+typedef int vcl_be_func(struct cli *, struct director *, void *);
+
+int VCL_IterDirector(struct cli *, const char *, vcl_be_func *, void *);
 
 /* cache_vrt.c */
 void VRTPRIV_init(struct vrt_privs *privs);
diff --git a/bin/varnishd/cache/cache_vcl.c b/bin/varnishd/cache/cache_vcl.c
index 36b64c5..afb4ea0 100644
--- a/bin/varnishd/cache/cache_vcl.c
+++ b/bin/varnishd/cache/cache_vcl.c
@@ -32,6 +32,7 @@
 
 #include <errno.h>
 #include <dlfcn.h>
+#include <fnmatch.h>
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -384,6 +385,69 @@ VCL_DelDirector(struct director *d)
 	d->destroy(d);
 }
 
+static int
+vcl_iterdir(struct cli *cli, const char *pat, const struct vcl *vcl,
+    vcl_be_func *func, void *priv)
+{
+	int i, found = 0;
+	struct director *d;
+
+	VTAILQ_FOREACH(d, &vcl->director_list, vcl_list) {
+		if (fnmatch(pat, d->display_name, 0))
+			continue;
+		found++;
+		i = func(cli, d, priv);
+		if (i < 0)
+			return (i);
+		found += i;
+	}
+	return (found);
+}
+
+int
+VCL_IterDirector(struct cli *cli, const char *pat,
+    vcl_be_func *func, void *priv)
+{
+	int i, found = 0;
+	struct vsb *vsb;
+	struct vcl *vcl;
+
+	ASSERT_CLI();
+	vsb = VSB_new_auto();
+	AN(vsb);
+	if (pat == NULL || *pat == '\0' || !strcmp(pat, "*")) {
+		// all backends in active VCL
+		VSB_printf(vsb, "%s.*", VCL_Name(vcl_active));
+		vcl = vcl_active;
+	} else if (strchr(pat, '.') == NULL) {
+		// pattern applies to active vcl
+		VSB_printf(vsb, "%s.%s", VCL_Name(vcl_active), pat);
+		vcl = vcl_active;
+	} else {
+		// use pattern as is
+		VSB_cat(vsb, pat);
+		vcl = NULL;
+	}
+	AZ(VSB_finish(vsb));
+	Lck_Lock(&vcl_mtx);
+	if (vcl != NULL) {
+		found = vcl_iterdir(cli, VSB_data(vsb), vcl, func, priv);
+	} else {
+		VTAILQ_FOREACH(vcl, &vcl_head, list) {
+			i = vcl_iterdir(cli, VSB_data(vsb), vcl, func, priv);
+			if (i < 0) {
+				found = i;
+				break;
+			} else {
+				found += i;
+			}
+		}
+	}
+	Lck_Unlock(&vcl_mtx);
+	VSB_destroy(&vsb);
+	return (found);
+}
+
 static void
 vcl_BackendEvent(const struct vcl *vcl, enum vcl_event_e e)
 {

From phk at FreeBSD.org  Tue Nov 14 12:53:06 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Tue, 14 Nov 2017 12:53:06 +0000 (UTC)
Subject: [master] bcda8d9 Move the admin health states all the way to VDI
Message-ID: <20171114125306.1D31690BB6@lists.varnish-cache.org>


commit bcda8d9d0cd70f4f44e38d4bdd1fa3a8745bf753
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Nov 14 12:33:49 2017 +0000

    Move the admin health states all the way to VDI

diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c
index 5bede5c..c1b72f1 100644
--- a/bin/varnishd/cache/cache_backend.c
+++ b/bin/varnishd/cache/cache_backend.c
@@ -355,7 +355,7 @@ vbe_panic(const struct director *d, struct vsb *vsb)
 	VSB_printf(vsb, "health = %s,\n",
 	    bp->director->health ? "healthy" : "sick");
 	VSB_printf(vsb, "admin_health = %s, changed = %f,\n",
-	    VBE_AdminHealth(bp->director->admin_health),
+	    VDI_Ahealth(bp->director),
 	    bp->director->health_changed);
 	VSB_printf(vsb, "n_conn = %u,\n", bp->n_conn);
 }
diff --git a/bin/varnishd/cache/cache_backend.h b/bin/varnishd/cache/cache_backend.h
index a9f2901..bea5cd2 100644
--- a/bin/varnishd/cache/cache_backend.h
+++ b/bin/varnishd/cache/cache_backend.h
@@ -41,7 +41,6 @@ struct vbp_target;
 struct vrt_ctx;
 struct vrt_backend_probe;
 struct tcp_pool;
-struct vbe_ahealth;
 
 /*--------------------------------------------------------------------
  * An instance of a backend from a VCL program.
@@ -79,7 +78,6 @@ void VBE_fill_director(struct backend *be);
 /* cache_backend_cfg.c */
 void VBE_SetHappy(const struct backend *, uint64_t);
 void VBE_Delete(const struct director *);
-const char *VBE_AdminHealth(const struct vbe_ahealth *);
 
 /* cache_backend_probe.c */
 void VBP_Insert(struct backend *b, struct vrt_backend_probe const *p,
diff --git a/bin/varnishd/cache/cache_backend_cfg.c b/bin/varnishd/cache/cache_backend_cfg.c
index 733975c..d795b5b 100644
--- a/bin/varnishd/cache/cache_backend_cfg.c
+++ b/bin/varnishd/cache/cache_backend_cfg.c
@@ -55,50 +55,6 @@ static VTAILQ_HEAD(, backend) cool_backends =
     VTAILQ_HEAD_INITIALIZER(cool_backends);
 static struct lock backends_mtx;
 
-/*--------------------------------------------------------------------*/
-
-#define AHEALTH_LIST		\
-	AHEALTH(healthy)	\
-	AHEALTH(sick)		\
-	AHEALTH(probe)		\
-	AHEALTH(deleted)
-
-struct vbe_ahealth {
-	const char		*state;
-};
-
-#define AHEALTH(x) static const struct vbe_ahealth vbe_ah_##x[1] = {{ #x }};
-AHEALTH_LIST
-#undef AHEALTH
-
-/*---------------------------------------------------------------------
- * String to admin_health
- */
-
-static const struct vbe_ahealth *
-vbe_str2adminhealth(const char *wstate)
-{
-
-#define FOO(x, y) if (strcasecmp(wstate, #x) == 0) return (vbe_ah_##y)
-	FOO(healthy,	healthy);
-	FOO(sick,	sick);
-	FOO(probe,	probe);
-	FOO(auto,	probe);
-	return (NULL);
-#undef FOO
-}
-
-const char *
-VBE_AdminHealth(const struct vbe_ahealth *ah)
-{
-#define AHEALTH(x) if (ah == vbe_ah_##x) return(ah->state);
-AHEALTH_LIST
-#undef AHEALTH
-	WRONG("Wrong Admin Health State");
-}
-
-#undef AHEALTH_LIST
-
 /*--------------------------------------------------------------------
  * Create a new static or dynamic director::backend instance.
  */
@@ -135,7 +91,7 @@ VRT_new_backend(VRT_CTX, const struct vrt_backend *vrt)
 
 	b->director->health = 1;
 	b->director->health_changed = VTIM_real();
-	b->director->admin_health = vbe_ah_probe;
+	b->director->admin_health = VDI_AH_PROBE;
 
 	vbp = vrt->probe;
 	if (vbp == NULL)
@@ -179,7 +135,7 @@ VRT_delete_backend(VRT_CTX, struct director **dp)
 	TAKE_OBJ_NOTNULL(d, dp, DIRECTOR_MAGIC);
 	CAST_OBJ_NOTNULL(be, d->priv, BACKEND_MAGIC);
 	Lck_Lock(&be->mtx);
-	be->director->admin_health = vbe_ah_deleted;
+	be->director->admin_health = VDI_AH_DELETED;
 	be->director->health_changed = VTIM_real();
 	be->cooled = VTIM_real() + 60.;
 	Lck_Unlock(&be->mtx);
@@ -249,16 +205,16 @@ VDI_Healthy(const struct director *d, double *changed)
 	if (changed != NULL)
 		*changed = d->health_changed;
 
-	if (d->admin_health == vbe_ah_probe)
+	if (d->admin_health == VDI_AH_PROBE)
 		return (d->health);
 
-	if (d->admin_health == vbe_ah_sick)
+	if (d->admin_health == VDI_AH_SICK)
 		return (0);
 
-	if (d->admin_health == vbe_ah_deleted)
+	if (d->admin_health == VDI_AH_DELETED)
 		return (0);
 
-	if (d->admin_health == vbe_ah_healthy)
+	if (d->admin_health == VDI_AH_HEALTHY)
 		return (1);
 
 	WRONG("Wrong admin health");
@@ -277,12 +233,12 @@ do_list(struct cli *cli, struct director *d, void *priv)
 	probes = priv;
 	CHECK_OBJ_NOTNULL(d, DIRECTOR_MAGIC);
 	CAST_OBJ_NOTNULL(be, d->priv, BACKEND_MAGIC);
-	if (d->admin_health == vbe_ah_deleted)
+	if (d->admin_health == VDI_AH_DELETED)
 		return (0);
 
 	VCLI_Out(cli, "\n%-30s", d->display_name);
 
-	VCLI_Out(cli, " %-10s", VBE_AdminHealth(d->admin_health));
+	VCLI_Out(cli, " %-10s", VDI_Ahealth(d));
 
 	if (be->probe == NULL)
 		VCLI_Out(cli, " %-20s", "Healthy (no probe)");
@@ -329,19 +285,16 @@ cli_backend_list(struct cli *cli, const char * const *av, void *priv)
 static int __match_proto__(vcl_be_func)
 do_set_health(struct cli *cli, struct director *d, void *priv)
 {
-	const struct vbe_ahealth *ah;
 	unsigned prev;
 
 	(void)cli;
 	AN(priv);
 	CHECK_OBJ_NOTNULL(d, DIRECTOR_MAGIC);
-	if (d->admin_health == vbe_ah_deleted)
+	if (d->admin_health == VDI_AH_DELETED)
 		return (0);
-	ah = *(const struct vbe_ahealth **)priv;
-	AN(ah);
 	prev = VDI_Healthy(d, NULL);
-	if (d->admin_health != vbe_ah_deleted)
-		d->admin_health = ah;
+	d->admin_health = *(const struct vdi_ahealth **)priv;
+	(void)VDI_Ahealth(d);			// Acts like type-check
 	if (prev != VDI_Healthy(d, NULL))
 		d->health_changed = VTIM_real();
 
@@ -351,7 +304,7 @@ do_set_health(struct cli *cli, struct director *d, void *priv)
 static void __match_proto__()
 cli_backend_set_health(struct cli *cli, const char * const *av, void *priv)
 {
-	const struct vbe_ahealth *ah;
+	const struct vdi_ahealth *ah;
 	int n;
 
 	(void)av;
@@ -359,8 +312,8 @@ cli_backend_set_health(struct cli *cli, const char * const *av, void *priv)
 	ASSERT_CLI();
 	AN(av[2]);
 	AN(av[3]);
-	ah = vbe_str2adminhealth(av[3]);
-	if (ah == NULL) {
+	ah = VDI_Str2Ahealth(av[3]);
+	if (ah == NULL || ah == VDI_AH_DELETED) {
 		VCLI_Out(cli, "Invalid state %s", av[3]);
 		VCLI_SetResult(cli, CLIS_PARAM);
 		return;
diff --git a/bin/varnishd/cache/cache_director.c b/bin/varnishd/cache/cache_director.c
index 51d2dd3..cbb3e8f 100644
--- a/bin/varnishd/cache/cache_director.c
+++ b/bin/varnishd/cache/cache_director.c
@@ -39,6 +39,37 @@
 
 #include "cache_director.h"
 
+/* -------------------------------------------------------------------*/
+
+struct vdi_ahealth {
+	const char		*name;
+};
+
+#define VBE_AHEALTH(l,u)						\
+	static const struct vdi_ahealth vdi_ah_##l[1] = {{#l}};		\
+	const struct vdi_ahealth * const VDI_AH_##u = vdi_ah_##l;
+VBE_AHEALTH_LIST
+#undef VBE_AHEALTH
+
+const struct vdi_ahealth *
+VDI_Str2Ahealth(const char *t)
+{
+#define VBE_AHEALTH(l,u) if (!strcasecmp(t, #l)) return (VDI_AH_##u);
+VBE_AHEALTH_LIST
+#undef VBE_AHEALTH
+	if (!strcasecmp(t, "auto")) return (VDI_AH_PROBE);
+	return (NULL);
+}
+
+const char *
+VDI_Ahealth(const struct director *d)
+{
+
+	CHECK_OBJ_NOTNULL(d, DIRECTOR_MAGIC);
+	AN(d->admin_health);
+	return (d->admin_health->name);
+}
+
 /* Resolve director --------------------------------------------------*/
 
 static const struct director *
diff --git a/bin/varnishd/cache/cache_director.h b/bin/varnishd/cache/cache_director.h
index 360da41..c074cf1 100644
--- a/bin/varnishd/cache/cache_director.h
+++ b/bin/varnishd/cache/cache_director.h
@@ -84,7 +84,7 @@ struct director {
 	struct vcl		*vcl;
 
 	unsigned		health;
-	const struct vbe_ahealth *admin_health;
+	const struct vdi_ahealth *admin_health;
 	double			health_changed;
 };
 
@@ -93,3 +93,18 @@ unsigned VDI_Healthy(const struct director *, double *);
 /* cache_vcl.c */
 int VCL_AddDirector(struct vcl *, struct director *, const char *);
 void VCL_DelDirector(struct director *);
+
+/* cache_director.c */
+
+#define VBE_AHEALTH_LIST			\
+	VBE_AHEALTH(healthy,	HEALTHY)	\
+	VBE_AHEALTH(sick,	SICK)		\
+	VBE_AHEALTH(probe,	PROBE)		\
+	VBE_AHEALTH(deleted,	DELETED)
+
+#define VBE_AHEALTH(l,u) extern const struct vdi_ahealth * const VDI_AH_##u;
+VBE_AHEALTH_LIST
+#undef VBE_AHEALTH
+
+const struct vdi_ahealth *VDI_Str2Ahealth(const char *t);
+const char *VDI_Ahealth(const struct director *d);

From phk at FreeBSD.org  Tue Nov 14 12:53:06 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Tue, 14 Nov 2017 12:53:06 +0000 (UTC)
Subject: [master] 08cea68 Move the backend.* CLI functions to VDI level
Message-ID: <20171114125306.3447A90BB9@lists.varnish-cache.org>


commit 08cea68f4c8fe26b6cc740bc38409b593c7cb1a1
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Nov 14 12:51:51 2017 +0000

    Move the backend.* CLI functions to VDI level

diff --git a/bin/varnishd/cache/cache_backend_cfg.c b/bin/varnishd/cache/cache_backend_cfg.c
index d795b5b..d5e48bf 100644
--- a/bin/varnishd/cache/cache_backend_cfg.c
+++ b/bin/varnishd/cache/cache_backend_cfg.c
@@ -32,13 +32,11 @@
 
 #include "config.h"
 
-#include <fnmatch.h>
 #include <stdio.h>
 #include <stdlib.h>
 
 #include "cache_varnishd.h"
 
-#include "vcli_serve.h"
 #include "vtim.h"
 #include "waiter/waiter.h"
 
@@ -193,146 +191,6 @@ VBE_Delete(const struct director *d)
 	FREE_OBJ(be);
 }
 
-/*--------------------------------------------------------------------
- * Test if backend is healthy and report when it last changed
- */
-
-unsigned
-VDI_Healthy(const struct director *d, double *changed)
-{
-	CHECK_OBJ_NOTNULL(d, DIRECTOR_MAGIC);
-
-	if (changed != NULL)
-		*changed = d->health_changed;
-
-	if (d->admin_health == VDI_AH_PROBE)
-		return (d->health);
-
-	if (d->admin_health == VDI_AH_SICK)
-		return (0);
-
-	if (d->admin_health == VDI_AH_DELETED)
-		return (0);
-
-	if (d->admin_health == VDI_AH_HEALTHY)
-		return (1);
-
-	WRONG("Wrong admin health");
-}
-
-/*---------------------------------------------------------------------*/
-
-static int __match_proto__(vcl_be_func)
-do_list(struct cli *cli, struct director *d, void *priv)
-{
-	int *probes;
-	char time_str[VTIM_FORMAT_SIZE];
-	struct backend *be;
-
-	AN(priv);
-	probes = priv;
-	CHECK_OBJ_NOTNULL(d, DIRECTOR_MAGIC);
-	CAST_OBJ_NOTNULL(be, d->priv, BACKEND_MAGIC);
-	if (d->admin_health == VDI_AH_DELETED)
-		return (0);
-
-	VCLI_Out(cli, "\n%-30s", d->display_name);
-
-	VCLI_Out(cli, " %-10s", VDI_Ahealth(d));
-
-	if (be->probe == NULL)
-		VCLI_Out(cli, " %-20s", "Healthy (no probe)");
-	else {
-		if (d->health)
-			VCLI_Out(cli, " %-20s", "Healthy ");
-		else
-			VCLI_Out(cli, " %-20s", "Sick ");
-		VBP_Status(cli, be, *probes);
-	}
-
-	VTIM_format(d->health_changed, time_str);
-	VCLI_Out(cli, " %s", time_str);
-
-	return (0);
-}
-
-static void __match_proto__(cli_func_t)
-cli_backend_list(struct cli *cli, const char * const *av, void *priv)
-{
-	int probes = 0;
-
-	(void)priv;
-	ASSERT_CLI();
-	if (av[2] != NULL && !strcmp(av[2], "-p")) {
-		av++;
-		probes = 1;
-	} else if (av[2] != NULL && av[2][0] == '-') {
-		VCLI_Out(cli, "Invalid flags %s", av[2]);
-		VCLI_SetResult(cli, CLIS_PARAM);
-		return;
-	} else if (av[3] != NULL) {
-		VCLI_Out(cli, "Too many arguments");
-		VCLI_SetResult(cli, CLIS_PARAM);
-		return;
-	}
-	VCLI_Out(cli, "%-30s %-10s %-20s %s", "Backend name", "Admin",
-	    "Probe", "Last updated");
-	(void)VCL_IterDirector(cli, av[2], do_list, &probes);
-}
-
-/*---------------------------------------------------------------------*/
-
-static int __match_proto__(vcl_be_func)
-do_set_health(struct cli *cli, struct director *d, void *priv)
-{
-	unsigned prev;
-
-	(void)cli;
-	AN(priv);
-	CHECK_OBJ_NOTNULL(d, DIRECTOR_MAGIC);
-	if (d->admin_health == VDI_AH_DELETED)
-		return (0);
-	prev = VDI_Healthy(d, NULL);
-	d->admin_health = *(const struct vdi_ahealth **)priv;
-	(void)VDI_Ahealth(d);			// Acts like type-check
-	if (prev != VDI_Healthy(d, NULL))
-		d->health_changed = VTIM_real();
-
-	return (0);
-}
-
-static void __match_proto__()
-cli_backend_set_health(struct cli *cli, const char * const *av, void *priv)
-{
-	const struct vdi_ahealth *ah;
-	int n;
-
-	(void)av;
-	(void)priv;
-	ASSERT_CLI();
-	AN(av[2]);
-	AN(av[3]);
-	ah = VDI_Str2Ahealth(av[3]);
-	if (ah == NULL || ah == VDI_AH_DELETED) {
-		VCLI_Out(cli, "Invalid state %s", av[3]);
-		VCLI_SetResult(cli, CLIS_PARAM);
-		return;
-	}
-	n = VCL_IterDirector(cli, av[2], do_set_health, &ah);
-	if (n == 0) {
-		VCLI_Out(cli, "No Backends matches");
-		VCLI_SetResult(cli, CLIS_PARAM);
-	}
-}
-
-/*---------------------------------------------------------------------*/
-
-static struct cli_proto backend_cmds[] = {
-	{ CLICMD_BACKEND_LIST,		"", cli_backend_list },
-	{ CLICMD_BACKEND_SET_HEALTH,	"", cli_backend_set_health },
-	{ NULL }
-};
-
 /*---------------------------------------------------------------------*/
 
 void
@@ -362,6 +220,5 @@ void
 VBE_InitCfg(void)
 {
 
-	CLI_AddFuncs(backend_cmds);
 	Lck_New(&backends_mtx, lck_vbe);
 }
diff --git a/bin/varnishd/cache/cache_director.c b/bin/varnishd/cache/cache_director.c
index cbb3e8f..f47ac1a 100644
--- a/bin/varnishd/cache/cache_director.c
+++ b/bin/varnishd/cache/cache_director.c
@@ -38,6 +38,10 @@
 #include "cache_varnishd.h"
 
 #include "cache_director.h"
+#include "cache_backend.h"
+
+#include "vcli_serve.h"
+#include "vtim.h"
 
 /* -------------------------------------------------------------------*/
 
@@ -51,8 +55,8 @@ struct vdi_ahealth {
 VBE_AHEALTH_LIST
 #undef VBE_AHEALTH
 
-const struct vdi_ahealth *
-VDI_Str2Ahealth(const char *t)
+static const struct vdi_ahealth *
+vdi_str2ahealth(const char *t)
 {
 #define VBE_AHEALTH(l,u) if (!strcasecmp(t, #l)) return (VDI_AH_##u);
 VBE_AHEALTH_LIST
@@ -249,3 +253,152 @@ VDI_Panic(const struct director *d, struct vsb *vsb, const char *nm)
 	VSB_indent(vsb, -2);
 	VSB_printf(vsb, "},\n");
 }
+
+/*--------------------------------------------------------------------
+ * Test if backend is healthy and report when it last changed
+ */
+
+unsigned
+VDI_Healthy(const struct director *d, double *changed)
+{
+	CHECK_OBJ_NOTNULL(d, DIRECTOR_MAGIC);
+
+	if (changed != NULL)
+		*changed = d->health_changed;
+
+	if (d->admin_health == VDI_AH_PROBE)
+		return (d->health);
+
+	if (d->admin_health == VDI_AH_SICK)
+		return (0);
+
+	if (d->admin_health == VDI_AH_DELETED)
+		return (0);
+
+	if (d->admin_health == VDI_AH_HEALTHY)
+		return (1);
+
+	WRONG("Wrong admin health");
+}
+
+/*---------------------------------------------------------------------*/
+
+static int __match_proto__(vcl_be_func)
+do_list(struct cli *cli, struct director *d, void *priv)
+{
+	int *probes;
+	char time_str[VTIM_FORMAT_SIZE];
+	struct backend *be;
+
+	AN(priv);
+	probes = priv;
+	CHECK_OBJ_NOTNULL(d, DIRECTOR_MAGIC);
+	CAST_OBJ_NOTNULL(be, d->priv, BACKEND_MAGIC);
+	if (d->admin_health == VDI_AH_DELETED)
+		return (0);
+
+	VCLI_Out(cli, "\n%-30s", d->display_name);
+
+	VCLI_Out(cli, " %-10s", VDI_Ahealth(d));
+
+	if (be->probe == NULL)
+		VCLI_Out(cli, " %-20s", "Healthy (no probe)");
+	else {
+		if (d->health)
+			VCLI_Out(cli, " %-20s", "Healthy ");
+		else
+			VCLI_Out(cli, " %-20s", "Sick ");
+		VBP_Status(cli, be, *probes);
+	}
+
+	VTIM_format(d->health_changed, time_str);
+	VCLI_Out(cli, " %s", time_str);
+
+	return (0);
+}
+
+static void __match_proto__(cli_func_t)
+cli_backend_list(struct cli *cli, const char * const *av, void *priv)
+{
+	int probes = 0;
+
+	(void)priv;
+	ASSERT_CLI();
+	if (av[2] != NULL && !strcmp(av[2], "-p")) {
+		av++;
+		probes = 1;
+	} else if (av[2] != NULL && av[2][0] == '-') {
+		VCLI_Out(cli, "Invalid flags %s", av[2]);
+		VCLI_SetResult(cli, CLIS_PARAM);
+		return;
+	} else if (av[3] != NULL) {
+		VCLI_Out(cli, "Too many arguments");
+		VCLI_SetResult(cli, CLIS_PARAM);
+		return;
+	}
+	VCLI_Out(cli, "%-30s %-10s %-20s %s", "Backend name", "Admin",
+	    "Probe", "Last updated");
+	(void)VCL_IterDirector(cli, av[2], do_list, &probes);
+}
+
+/*---------------------------------------------------------------------*/
+
+static int __match_proto__(vcl_be_func)
+do_set_health(struct cli *cli, struct director *d, void *priv)
+{
+	unsigned prev;
+
+	(void)cli;
+	AN(priv);
+	CHECK_OBJ_NOTNULL(d, DIRECTOR_MAGIC);
+	if (d->admin_health == VDI_AH_DELETED)
+		return (0);
+	prev = VDI_Healthy(d, NULL);
+	d->admin_health = *(const struct vdi_ahealth **)priv;
+	(void)VDI_Ahealth(d);			// Acts like type-check
+	if (prev != VDI_Healthy(d, NULL))
+		d->health_changed = VTIM_real();
+
+	return (0);
+}
+
+static void __match_proto__()
+cli_backend_set_health(struct cli *cli, const char * const *av, void *priv)
+{
+	const struct vdi_ahealth *ah;
+	int n;
+
+	(void)av;
+	(void)priv;
+	ASSERT_CLI();
+	AN(av[2]);
+	AN(av[3]);
+	ah = vdi_str2ahealth(av[3]);
+	if (ah == NULL || ah == VDI_AH_DELETED) {
+		VCLI_Out(cli, "Invalid state %s", av[3]);
+		VCLI_SetResult(cli, CLIS_PARAM);
+		return;
+	}
+	n = VCL_IterDirector(cli, av[2], do_set_health, &ah);
+	if (n == 0) {
+		VCLI_Out(cli, "No Backends matches");
+		VCLI_SetResult(cli, CLIS_PARAM);
+	}
+}
+
+/*---------------------------------------------------------------------*/
+
+static struct cli_proto backend_cmds[] = {
+	{ CLICMD_BACKEND_LIST,		"", cli_backend_list },
+	{ CLICMD_BACKEND_SET_HEALTH,	"", cli_backend_set_health },
+	{ NULL }
+};
+
+/*---------------------------------------------------------------------*/
+
+void
+VDI_Init(void)
+{
+
+	CLI_AddFuncs(backend_cmds);
+}
diff --git a/bin/varnishd/cache/cache_director.h b/bin/varnishd/cache/cache_director.h
index c074cf1..8d1d380 100644
--- a/bin/varnishd/cache/cache_director.h
+++ b/bin/varnishd/cache/cache_director.h
@@ -106,5 +106,4 @@ void VCL_DelDirector(struct director *);
 VBE_AHEALTH_LIST
 #undef VBE_AHEALTH
 
-const struct vdi_ahealth *VDI_Str2Ahealth(const char *t);
 const char *VDI_Ahealth(const struct director *d);
diff --git a/bin/varnishd/cache/cache_main.c b/bin/varnishd/cache/cache_main.c
index 239c095..799cda3 100644
--- a/bin/varnishd/cache/cache_main.c
+++ b/bin/varnishd/cache/cache_main.c
@@ -339,6 +339,7 @@ child_main(int sigmagic, size_t altstksz)
 	VBO_Init();
 	VTP_Init();
 	VBP_Init();
+	VDI_Init();
 	VBE_InitCfg();
 	Pool_Init();
 	V1P_Init();
diff --git a/bin/varnishd/cache/cache_varnishd.h b/bin/varnishd/cache/cache_varnishd.h
index b7fb23c..21b1e63 100644
--- a/bin/varnishd/cache/cache_varnishd.h
+++ b/bin/varnishd/cache/cache_varnishd.h
@@ -71,6 +71,7 @@ void VDI_Finish(struct worker *wrk, struct busyobj *bo);
 enum sess_close VDI_Http1Pipe(struct req *, struct busyobj *);
 void VDI_Panic(const struct director *, struct vsb *, const char *nm);
 void VDI_Event(const struct director *d, enum vcl_event_e ev);
+void VDI_Init(void);
 
 /* cache_exp.c */
 double EXP_Ttl(const struct req *, const struct objcore *);
diff --git a/bin/varnishd/flint.lnt b/bin/varnishd/flint.lnt
index 7619b33..e31a0d5 100644
--- a/bin/varnishd/flint.lnt
+++ b/bin/varnishd/flint.lnt
@@ -6,6 +6,9 @@
 -printf(2, http_PrintfHeader)
 -printf(2, VSB_printf)
 
+-esym(759, VDI_AH_*)	// could be moved from header to module
+-esym(765, VDI_AH_*)	// could be made static
+
 -esym(755, vct_*)
 -esym(759, vpf_*)
 -esym(765, vpf_*)

From hermunn at varnish-software.com  Tue Nov 14 13:40:07 2017
From: hermunn at varnish-software.com (Pål Hermunn Johansen)
Date: Tue, 14 Nov 2017 13:40:07 +0000 (UTC)
Subject: [4.1] 5024f60 Prepare for 4.1.9 release
Message-ID: <20171114134007.2E36C90ECB@lists.varnish-cache.org>


commit 5024f60c3a51f537279977989b645e983a946e1a
Author: P?l Hermunn Johansen <hermunn at varnish-software.com>
Date:   Tue Nov 14 14:12:45 2017 +0100

    Prepare for 4.1.9 release

diff --git a/configure.ac b/configure.ac
index 64c28d7..6e4e859 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 AC_PREREQ(2.59)
 AC_COPYRIGHT([Copyright (c) 2006 Verdens Gang AS
-Copyright (c) 2006-2016 Varnish Software])
+Copyright (c) 2006-2017 Varnish Software])
 AC_REVISION([$Id$])
-AC_INIT([Varnish], [4.1.8], [varnish-dev at varnish-cache.org])
+AC_INIT([Varnish], [4.1.9], [varnish-dev at varnish-cache.org])
 AC_CONFIG_SRCDIR(include/miniobj.h)
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
diff --git a/doc/changes.rst b/doc/changes.rst
index 266f575..a8ab3c4 100644
--- a/doc/changes.rst
+++ b/doc/changes.rst
@@ -1,6 +1,6 @@
-======================================
-Varnish Cache 4.1.9-beta1 (unreleased)
-======================================
+================================
+Varnish Cache 4.1.9 (2017-11-14)
+================================
 
 Changes since 4.1.8:
 

From phk at FreeBSD.org  Tue Nov 14 17:30:08 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Tue, 14 Nov 2017 17:30:08 +0000 (UTC)
Subject: [master] eaac492 Collapse two source files to one.
Message-ID: <20171114173008.7D76D90F9E@lists.varnish-cache.org>


commit eaac49272089c0bf1f8ab3ed5a3c1689fe9ce267
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Nov 14 17:29:29 2017 +0000

    Collapse two source files to one.

diff --git a/bin/varnishd/Makefile.am b/bin/varnishd/Makefile.am
index a652cc9..68a7072 100644
--- a/bin/varnishd/Makefile.am
+++ b/bin/varnishd/Makefile.am
@@ -11,7 +11,6 @@ sbin_PROGRAMS = varnishd
 varnishd_SOURCES = \
 	cache/cache_acceptor.c \
 	cache/cache_backend.c \
-	cache/cache_backend_cfg.c \
 	cache/cache_backend_probe.c \
 	cache/cache_ban.c \
 	cache/cache_ban_build.c \
diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c
index c1b72f1..31f77e9 100644
--- a/bin/varnishd/cache/cache_backend.c
+++ b/bin/varnishd/cache/cache_backend.c
@@ -48,6 +48,17 @@
 
 #include "VSC_vbe.h"
 
+/*--------------------------------------------------------------------*/
+
+static const char * const vbe_proto_ident = "HTTP Backend";
+
+static VTAILQ_HEAD(, backend) backends = VTAILQ_HEAD_INITIALIZER(backends);
+static VTAILQ_HEAD(, backend) cool_backends =
+    VTAILQ_HEAD_INITIALIZER(cool_backends);
+static struct lock backends_mtx;
+
+/*--------------------------------------------------------------------*/
+
 #define FIND_TMO(tmx, dst, bo, be)					\
 	do {								\
 		CHECK_OBJ_NOTNULL(bo, BUSYOBJ_MAGIC);			\
@@ -335,6 +346,39 @@ vbe_dir_event(const struct director *d, enum vcl_event_e ev)
 	}
 }
 
+/*---------------------------------------------------------------------*/
+
+static void __match_proto__(vdi_destroy_f)
+vbe_destroy(const struct director *d)
+{
+	struct backend *be;
+
+	ASSERT_CLI();
+	CAST_OBJ_NOTNULL(be, d->priv, BACKEND_MAGIC);
+
+	if (be->probe != NULL)
+		VBP_Remove(be);
+
+	Lck_Lock(&backends_mtx);
+	if (be->cooled > 0)
+		VTAILQ_REMOVE(&cool_backends, be, list);
+	else
+		VTAILQ_REMOVE(&backends, be, list);
+	VSC_C_main->n_backend--;
+	VTP_Rel(&be->tcp_pool);
+	Lck_Unlock(&backends_mtx);
+
+#define DA(x)	do { if (be->x != NULL) free(be->x); } while (0)
+#define DN(x)	/**/
+	VRT_BACKEND_HANDLE();
+#undef DA
+#undef DN
+
+	AZ(be->vsc);
+	Lck_Delete(&be->mtx);
+	FREE_OBJ(be);
+}
+
 /*--------------------------------------------------------------------*/
 
 static void
@@ -360,17 +404,40 @@ vbe_panic(const struct director *d, struct vsb *vsb)
 	VSB_printf(vsb, "n_conn = %u,\n", bp->n_conn);
 }
 
-/*--------------------------------------------------------------------*/
+/*--------------------------------------------------------------------
+ * Create a new static or dynamic director::backend instance.
+ */
 
-void
-VBE_fill_director(struct backend *be)
+struct director *
+VRT_new_backend(VRT_CTX, const struct vrt_backend *vrt)
 {
+	struct backend *be;
 	struct director *d;
+	struct vcl *vcl;
+	const struct vrt_backend_probe *vbp;
+	int retval;
+
+	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
+	CHECK_OBJ_NOTNULL(vrt, VRT_BACKEND_MAGIC);
+	assert(vrt->ipv4_suckaddr != NULL || vrt->ipv6_suckaddr != NULL);
+
+	vcl = ctx->vcl;
+	AN(vcl);
+	AN(vrt->vcl_name);
 
-	CHECK_OBJ_NOTNULL(be, BACKEND_MAGIC);
+	/* Create new backend */
+	ALLOC_OBJ(be, BACKEND_MAGIC);
+	XXXAN(be);
+	Lck_New(&be->mtx, lck_backend);
+
+#define DA(x)	do { if (vrt->x != NULL) REPLACE((be->x), (vrt->x)); } while (0)
+#define DN(x)	do { be->x = vrt->x; } while (0)
+	VRT_BACKEND_HANDLE();
+#undef DA
+#undef DN
 
-	INIT_OBJ(be->director, DIRECTOR_MAGIC);
 	d = be->director;
+	INIT_OBJ(d, DIRECTOR_MAGIC);
 	d->priv = be;
 	d->name = "backend";
 	d->vcl_name = be->vcl_name;
@@ -380,6 +447,105 @@ VBE_fill_director(struct backend *be)
 	d->getip = vbe_dir_getip;
 	d->finish = vbe_dir_finish;
 	d->event = vbe_dir_event;
-	d->destroy = VBE_Delete;
 	d->panic = vbe_panic;
+	d->destroy = vbe_destroy;
+
+	d->health = 1;
+	d->health_changed = VTIM_real();
+	d->admin_health = VDI_AH_PROBE;
+
+	vbp = vrt->probe;
+	if (vbp == NULL)
+		vbp = VCL_DefaultProbe(vcl);
+
+	Lck_Lock(&backends_mtx);
+	VTAILQ_INSERT_TAIL(&backends, be, list);
+	VSC_C_main->n_backend++;
+	be->tcp_pool = VTP_Ref(vrt->ipv4_suckaddr, vrt->ipv6_suckaddr,
+	    vbe_proto_ident);
+	Lck_Unlock(&backends_mtx);
+
+	if (vbp != NULL) {
+		VTP_AddRef(be->tcp_pool);
+		VBP_Insert(be, vbp, be->tcp_pool);
+	}
+
+	retval = VCL_AddDirector(ctx->vcl, d, vrt->vcl_name);
+
+	if (retval == 0)
+		return (d);
+
+	VRT_delete_backend(ctx, &d);
+	AZ(d);
+	return (NULL);
+}
+
+/*--------------------------------------------------------------------
+ * Delete a dynamic director::backend instance.  Undeleted dynamic and
+ * static instances are GC'ed when the VCL is discarded (in cache_vcl.c)
+ */
+
+void
+VRT_delete_backend(VRT_CTX, struct director **dp)
+{
+	struct director *d;
+	struct backend *be;
+
+	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
+	TAKE_OBJ_NOTNULL(d, dp, DIRECTOR_MAGIC);
+	CAST_OBJ_NOTNULL(be, d->priv, BACKEND_MAGIC);
+	Lck_Lock(&be->mtx);
+	be->director->admin_health = VDI_AH_DELETED;
+	be->director->health_changed = VTIM_real();
+	be->cooled = VTIM_real() + 60.;
+	Lck_Unlock(&be->mtx);
+	Lck_Lock(&backends_mtx);
+	VTAILQ_REMOVE(&backends, be, list);
+	VTAILQ_INSERT_TAIL(&cool_backends, be, list);
+	Lck_Unlock(&backends_mtx);
+
+	// NB. The backend is still usable for the ongoing transactions,
+	// this is why we don't bust the director's magic number.
+}
+
+void
+VBE_SetHappy(const struct backend *be, uint64_t happy)
+{
+
+	Lck_Lock(&backends_mtx);
+	if (be->vsc != NULL)
+		be->vsc->happy = happy;
+	Lck_Unlock(&backends_mtx);
+}
+
+/*---------------------------------------------------------------------*/
+
+void
+VBE_Poll(void)
+{
+	struct backend *be, *be2;
+	double now = VTIM_real();
+
+	ASSERT_CLI();
+	Lck_Lock(&backends_mtx);
+	VTAILQ_FOREACH_SAFE(be, &cool_backends, list, be2) {
+		CHECK_OBJ_NOTNULL(be, BACKEND_MAGIC);
+		if (be->cooled > now)
+			break;
+		if (be->n_conn > 0)
+			continue;
+		Lck_Unlock(&backends_mtx);
+		VCL_DelDirector(be->director);
+		Lck_Lock(&backends_mtx);
+	}
+	Lck_Unlock(&backends_mtx);
+}
+
+/*---------------------------------------------------------------------*/
+
+void
+VBE_InitCfg(void)
+{
+
+	Lck_New(&backends_mtx, lck_vbe);
 }
diff --git a/bin/varnishd/cache/cache_backend.h b/bin/varnishd/cache/cache_backend.h
index bea5cd2..ff3cde3 100644
--- a/bin/varnishd/cache/cache_backend.h
+++ b/bin/varnishd/cache/cache_backend.h
@@ -72,12 +72,8 @@ struct backend {
  * Prototypes
  */
 
-/* cache_backend.c */
-void VBE_fill_director(struct backend *be);
-
 /* cache_backend_cfg.c */
 void VBE_SetHappy(const struct backend *, uint64_t);
-void VBE_Delete(const struct director *);
 
 /* cache_backend_probe.c */
 void VBP_Insert(struct backend *b, struct vrt_backend_probe const *p,
diff --git a/bin/varnishd/cache/cache_backend_cfg.c b/bin/varnishd/cache/cache_backend_cfg.c
deleted file mode 100644
index d5e48bf..0000000
--- a/bin/varnishd/cache/cache_backend_cfg.c
+++ /dev/null
@@ -1,224 +0,0 @@
-/*-
- * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2015 Varnish Software AS
- * All rights reserved.
- *
- * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Handle configuration of backends from VCL programs.
- *
- */
-
-#include "config.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "cache_varnishd.h"
-
-#include "vtim.h"
-#include "waiter/waiter.h"
-
-#include "cache_director.h"
-#include "cache_backend.h"
-#include "cache_tcp_pool.h"
-
-#include "VSC_vbe.h"
-
-static const char * const vbe_proto_ident = "HTTP Backend";
-
-static VTAILQ_HEAD(, backend) backends = VTAILQ_HEAD_INITIALIZER(backends);
-static VTAILQ_HEAD(, backend) cool_backends =
-    VTAILQ_HEAD_INITIALIZER(cool_backends);
-static struct lock backends_mtx;
-
-/*--------------------------------------------------------------------
- * Create a new static or dynamic director::backend instance.
- */
-
-struct director *
-VRT_new_backend(VRT_CTX, const struct vrt_backend *vrt)
-{
-	struct backend *b;
-	struct director *d;
-	struct vcl *vcl;
-	const struct vrt_backend_probe *vbp;
-	int retval;
-
-	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
-	CHECK_OBJ_NOTNULL(vrt, VRT_BACKEND_MAGIC);
-	assert(vrt->ipv4_suckaddr != NULL || vrt->ipv6_suckaddr != NULL);
-
-	vcl = ctx->vcl;
-	AN(vcl);
-	AN(vrt->vcl_name);
-
-	/* Create new backend */
-	ALLOC_OBJ(b, BACKEND_MAGIC);
-	XXXAN(b);
-	Lck_New(&b->mtx, lck_backend);
-
-#define DA(x)	do { if (vrt->x != NULL) REPLACE((b->x), (vrt->x)); } while (0)
-#define DN(x)	do { b->x = vrt->x; } while (0)
-	VRT_BACKEND_HANDLE();
-#undef DA
-#undef DN
-
-	VBE_fill_director(b);
-
-	b->director->health = 1;
-	b->director->health_changed = VTIM_real();
-	b->director->admin_health = VDI_AH_PROBE;
-
-	vbp = vrt->probe;
-	if (vbp == NULL)
-		vbp = VCL_DefaultProbe(vcl);
-
-	Lck_Lock(&backends_mtx);
-	VTAILQ_INSERT_TAIL(&backends, b, list);
-	VSC_C_main->n_backend++;
-	b->tcp_pool = VTP_Ref(vrt->ipv4_suckaddr, vrt->ipv6_suckaddr,
-	    vbe_proto_ident);
-	Lck_Unlock(&backends_mtx);
-
-	if (vbp != NULL) {
-		VTP_AddRef(b->tcp_pool);
-		VBP_Insert(b, vbp, b->tcp_pool);
-	}
-
-	retval = VCL_AddDirector(ctx->vcl, b->director, vrt->vcl_name);
-
-	if (retval == 0)
-		return (b->director);
-
-	d = b->director;
-	VRT_delete_backend(ctx, &d);
-	AZ(d);
-	return (NULL);
-}
-
-/*--------------------------------------------------------------------
- * Delete a dynamic director::backend instance.  Undeleted dynamic and
- * static instances are GC'ed when the VCL is discarded (in cache_vcl.c)
- */
-
-void
-VRT_delete_backend(VRT_CTX, struct director **dp)
-{
-	struct director *d;
-	struct backend *be;
-
-	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
-	TAKE_OBJ_NOTNULL(d, dp, DIRECTOR_MAGIC);
-	CAST_OBJ_NOTNULL(be, d->priv, BACKEND_MAGIC);
-	Lck_Lock(&be->mtx);
-	be->director->admin_health = VDI_AH_DELETED;
-	be->director->health_changed = VTIM_real();
-	be->cooled = VTIM_real() + 60.;
-	Lck_Unlock(&be->mtx);
-	Lck_Lock(&backends_mtx);
-	VTAILQ_REMOVE(&backends, be, list);
-	VTAILQ_INSERT_TAIL(&cool_backends, be, list);
-	Lck_Unlock(&backends_mtx);
-
-	// NB. The backend is still usable for the ongoing transactions,
-	// this is why we don't bust the director's magic number.
-}
-
-void
-VBE_SetHappy(const struct backend *be, uint64_t happy)
-{
-
-	Lck_Lock(&backends_mtx);
-	if (be->vsc != NULL)
-		be->vsc->happy = happy;
-	Lck_Unlock(&backends_mtx);
-}
-
-/*---------------------------------------------------------------------
- * These are for cross-calls with cache_vcl.c only.
- */
-
-void
-VBE_Delete(const struct director *d)
-{
-	struct backend *be;
-
-	ASSERT_CLI();
-	CAST_OBJ_NOTNULL(be, d->priv, BACKEND_MAGIC);
-
-	if (be->probe != NULL)
-		VBP_Remove(be);
-
-	Lck_Lock(&backends_mtx);
-	if (be->cooled > 0)
-		VTAILQ_REMOVE(&cool_backends, be, list);
-	else
-		VTAILQ_REMOVE(&backends, be, list);
-	VSC_C_main->n_backend--;
-	VTP_Rel(&be->tcp_pool);
-	Lck_Unlock(&backends_mtx);
-
-#define DA(x)	do { if (be->x != NULL) free(be->x); } while (0)
-#define DN(x)	/**/
-	VRT_BACKEND_HANDLE();
-#undef DA
-#undef DN
-
-	AZ(be->vsc);
-	Lck_Delete(&be->mtx);
-	FREE_OBJ(be);
-}
-
-/*---------------------------------------------------------------------*/
-
-void
-VBE_Poll(void)
-{
-	struct backend *be, *be2;
-	double now = VTIM_real();
-
-	ASSERT_CLI();
-	Lck_Lock(&backends_mtx);
-	VTAILQ_FOREACH_SAFE(be, &cool_backends, list, be2) {
-		CHECK_OBJ_NOTNULL(be, BACKEND_MAGIC);
-		if (be->cooled > now)
-			break;
-		if (be->n_conn > 0)
-			continue;
-		Lck_Unlock(&backends_mtx);
-		VCL_DelDirector(be->director);
-		Lck_Lock(&backends_mtx);
-	}
-	Lck_Unlock(&backends_mtx);
-}
-
-/*---------------------------------------------------------------------*/
-
-void
-VBE_InitCfg(void)
-{
-
-	Lck_New(&backends_mtx, lck_vbe);
-}

From phk at FreeBSD.org  Wed Nov 15 07:52:08 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Wed, 15 Nov 2017 07:52:08 +0000 (UTC)
Subject: [master] 51a1d5a Use a third logexpect to cope with
 thread-scheduling/VSL order uncertainty.
Message-ID: <20171115075208.60A7590404@lists.varnish-cache.org>


commit 51a1d5a87f4f25d535b76fbd3a37c8d74ceb6a70
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Nov 15 07:50:05 2017 +0000

    Use a third logexpect to cope with thread-scheduling/VSL
    order uncertainty.

diff --git a/bin/varnishtest/tests/r02339.vtc b/bin/varnishtest/tests/r02339.vtc
index ef0444e..a3cc99f 100644
--- a/bin/varnishtest/tests/r02339.vtc
+++ b/bin/varnishtest/tests/r02339.vtc
@@ -50,12 +50,17 @@ varnish v1 -arg "-p thread_pools=1" -vcl+backend {
 	}
 } -start
 
+varnish v1 -cliok "param.set timeout_idle 2"
+
 logexpect l0 -v v1 -g raw {
 	expect * 0 ExpKill	"EXP_Expired x=1002"
 } -start
 
-logexpect l1 -v v1 {
+logexpect l2 -v v1 -g raw {
 	expect * 1002	Begin		"bereq 1001 fetch"
+} -start
+
+logexpect l1 -v v1 {
 
 	expect * 1003	VCL_call	HIT
 	expect * =	VCL_call	DELIVER
@@ -108,6 +113,7 @@ client c1 {
 } -run
 
 logexpect l0 -wait
+logexpect l2 -wait
 
 client c1 {
 	txreq -url recv

From hermunn at varnish-software.com  Wed Nov 15 08:39:04 2017
From: hermunn at varnish-software.com (Pål Hermunn Johansen)
Date: Wed, 15 Nov 2017 08:39:04 +0000 (UTC)
Subject: [5.2] 67e5624 Prepare for 5.2.1 release
Message-ID: <20171115083904.C85AF91122@lists.varnish-cache.org>


commit 67e56248220057f59f794ecc95d7a644b8492fef
Author: P?l Hermunn Johansen <hermunn at varnish-software.com>
Date:   Tue Nov 14 14:54:22 2017 +0100

    Prepare for 5.2.1 release

diff --git a/configure.ac b/configure.ac
index ab629c9..cdb4f30 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ(2.59)
 AC_COPYRIGHT([Copyright (c) 2006 Verdens Gang AS
 Copyright (c) 2006-2017 Varnish Software])
 AC_REVISION([$Id$])
-AC_INIT([Varnish], [5.2.0], [varnish-dev at varnish-cache.org])
+AC_INIT([Varnish], [5.2.1], [varnish-dev at varnish-cache.org])
 AC_CONFIG_SRCDIR(include/miniobj.h)
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
diff --git a/doc/changes.rst b/doc/changes.rst
index b548362..991e322 100644
--- a/doc/changes.rst
+++ b/doc/changes.rst
@@ -1,5 +1,5 @@
 ================================
-Varnish Cache 5.2.1 (unreleased)
+Varnish Cache 5.2.1 (2017-11-14)
 ================================
 
 Bugs fixed

From phk at FreeBSD.org  Wed Nov 15 09:42:05 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Wed, 15 Nov 2017 09:42:05 +0000 (UTC)
Subject: [master] 365e02a Directors, like all other code,
 should handle NULL BACKEND arguments sanely,
 in this case by failing VCL initialization.
Message-ID: <20171115094205.1746E912E1@lists.varnish-cache.org>


commit 365e02a800e149915260778b92685b99d507961f
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Nov 15 09:40:24 2017 +0000

    Directors, like all other code, should handle NULL BACKEND arguments
    sanely, in this case by failing VCL initialization.
    
    Fixes #2036

diff --git a/bin/varnishtest/tests/r02036.vtc b/bin/varnishtest/tests/r02036.vtc
new file mode 100644
index 0000000..f6bfcfc
--- /dev/null
+++ b/bin/varnishtest/tests/r02036.vtc
@@ -0,0 +1,29 @@
+varnishtest "NULL directors in vcl_init"
+
+server s1 {
+	rxreq
+	txresp
+} -start
+
+varnish v1 -vcl+backend {} -start
+
+varnish v1 -errvcl "NULL backend cannot be added" {
+	import directors;
+
+	probe cacheprobe {
+		.initial = 0;
+	}
+
+	backend b01 {
+		.host = "127.0.0.2";
+		.probe = cacheprobe;
+	}
+
+	sub vcl_init {
+		new hash = directors.hash();
+		hash.add_backend(b01,1.0);
+
+		new rr = directors.round_robin();
+		rr.add_backend(hash.backend("text"));
+	}
+}
diff --git a/lib/libvmod_directors/fall_back.c b/lib/libvmod_directors/fall_back.c
index 544c168..1f32615 100644
--- a/lib/libvmod_directors/fall_back.c
+++ b/lib/libvmod_directors/fall_back.c
@@ -122,7 +122,7 @@ vmod_fallback_add_backend(VRT_CTX,
 
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
 	CHECK_OBJ_NOTNULL(fb, VMOD_DIRECTORS_FALLBACK_MAGIC);
-	(void)vdir_add_backend(fb->vd, be, 0.0);
+	vdir_add_backend(ctx, fb->vd, be, 0.0);
 }
 
 VCL_VOID __match_proto__()
@@ -131,7 +131,7 @@ vmod_fallback_remove_backend(VRT_CTX,
 {
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
 	CHECK_OBJ_NOTNULL(fb, VMOD_DIRECTORS_FALLBACK_MAGIC);
-	vdir_remove_backend(fb->vd, be, &fb->cur);
+	vdir_remove_backend(ctx, fb->vd, be, &fb->cur);
 }
 
 VCL_BACKEND __match_proto__()
diff --git a/lib/libvmod_directors/hash.c b/lib/libvmod_directors/hash.c
index a8961df..5e5fc97 100644
--- a/lib/libvmod_directors/hash.c
+++ b/lib/libvmod_directors/hash.c
@@ -81,7 +81,7 @@ vmod_hash_add_backend(VRT_CTX,
 
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
 	CHECK_OBJ_NOTNULL(rr, VMOD_DIRECTORS_HASH_MAGIC);
-	(void)vdir_add_backend(rr->vd, be, w);
+	vdir_add_backend(ctx, rr->vd, be, w);
 }
 
 VCL_VOID __match_proto__()
@@ -91,7 +91,7 @@ vmod_hash_remove_backend(VRT_CTX,
 
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
 	CHECK_OBJ_NOTNULL(rr, VMOD_DIRECTORS_HASH_MAGIC);
-	vdir_remove_backend(rr->vd, be, NULL);
+	vdir_remove_backend(ctx, rr->vd, be, NULL);
 }
 
 VCL_BACKEND __match_proto__()
diff --git a/lib/libvmod_directors/random.c b/lib/libvmod_directors/random.c
index 0608021..b2924db 100644
--- a/lib/libvmod_directors/random.c
+++ b/lib/libvmod_directors/random.c
@@ -109,7 +109,7 @@ vmod_random_add_backend(VRT_CTX,
 
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
 	CHECK_OBJ_NOTNULL(rr, VMOD_DIRECTORS_RANDOM_MAGIC);
-	(void)vdir_add_backend(rr->vd, be, w);
+	vdir_add_backend(ctx, rr->vd, be, w);
 }
 
 VCL_VOID vmod_random_remove_backend(VRT_CTX,
@@ -117,7 +117,7 @@ VCL_VOID vmod_random_remove_backend(VRT_CTX,
 {
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
 	CHECK_OBJ_NOTNULL(rr, VMOD_DIRECTORS_RANDOM_MAGIC);
-	vdir_remove_backend(rr->vd, be, NULL);
+	vdir_remove_backend(ctx, rr->vd, be, NULL);
 }
 
 VCL_BACKEND __match_proto__()
diff --git a/lib/libvmod_directors/round_robin.c b/lib/libvmod_directors/round_robin.c
index 64ed115..8b4a92e 100644
--- a/lib/libvmod_directors/round_robin.c
+++ b/lib/libvmod_directors/round_robin.c
@@ -118,7 +118,7 @@ vmod_round_robin_add_backend(VRT_CTX,
 
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
 	CHECK_OBJ_NOTNULL(rr, VMOD_DIRECTORS_ROUND_ROBIN_MAGIC);
-	(void)vdir_add_backend(rr->vd, be, 0.0);
+	vdir_add_backend(ctx, rr->vd, be, 0.0);
 }
 
 VCL_VOID __match_proto__()
@@ -127,7 +127,7 @@ vmod_round_robin_remove_backend(VRT_CTX,
 {
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
 	CHECK_OBJ_NOTNULL(rr, VMOD_DIRECTORS_ROUND_ROBIN_MAGIC);
-	vdir_remove_backend(rr->vd, be, NULL);
+	vdir_remove_backend(ctx, rr->vd, be, NULL);
 }
 
 VCL_BACKEND __match_proto__()
diff --git a/lib/libvmod_directors/vdir.c b/lib/libvmod_directors/vdir.c
index c286497..a334635 100644
--- a/lib/libvmod_directors/vdir.c
+++ b/lib/libvmod_directors/vdir.c
@@ -113,12 +113,16 @@ vdir_unlock(struct vdir *vd)
 }
 
 
-unsigned
-vdir_add_backend(struct vdir *vd, VCL_BACKEND be, double weight)
+void
+vdir_add_backend(VRT_CTX, struct vdir *vd, VCL_BACKEND be, double weight)
 {
 	unsigned u;
 
 	CHECK_OBJ_NOTNULL(vd, VDIR_MAGIC);
+	if (be == NULL) {
+		VRT_fail(ctx, "NULL backend cannot be added");
+		return;
+	}
 	AN(be);
 	vdir_wrlock(vd);
 	if (vd->n_backend >= vd->l_backend)
@@ -129,17 +133,18 @@ vdir_add_backend(struct vdir *vd, VCL_BACKEND be, double weight)
 	vd->weight[u] = weight;
 	vd->total_weight += weight;
 	vdir_unlock(vd);
-	return (u);
 }
 
 void
-vdir_remove_backend(struct vdir *vd, VCL_BACKEND be, unsigned *cur)
+vdir_remove_backend(VRT_CTX, struct vdir *vd, VCL_BACKEND be, unsigned *cur)
 {
 	unsigned u, n;
 
 	CHECK_OBJ_NOTNULL(vd, VDIR_MAGIC);
-	if (be == NULL)
+	if (be == NULL) {
+		VRT_fail(ctx, "NULL backend cannot be removed");
 		return;
+	}
 	CHECK_OBJ(be, DIRECTOR_MAGIC);
 	vdir_wrlock(vd);
 	for (u = 0; u < vd->n_backend; u++)
diff --git a/lib/libvmod_directors/vdir.h b/lib/libvmod_directors/vdir.h
index 0bdfb04..c4862e5 100644
--- a/lib/libvmod_directors/vdir.h
+++ b/lib/libvmod_directors/vdir.h
@@ -47,8 +47,8 @@ void vdir_delete(struct vdir **vdp);
 void vdir_rdlock(struct vdir *vd);
 void vdir_wrlock(struct vdir *vd);
 void vdir_unlock(struct vdir *vd);
-unsigned vdir_add_backend(struct vdir *, VCL_BACKEND be, double weight);
-void vdir_remove_backend(struct vdir *, VCL_BACKEND be, unsigned *cur);
+void vdir_add_backend(VRT_CTX, struct vdir *, VCL_BACKEND, double weight);
+void vdir_remove_backend(VRT_CTX, struct vdir *, VCL_BACKEND, unsigned *cur);
 unsigned vdir_any_healthy(struct vdir *, const struct busyobj *,
     double *changed);
 VCL_BACKEND vdir_pick_be(struct vdir *, double w, const struct busyobj *);

From nils.goroll at uplex.de  Wed Nov 15 13:16:05 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Wed, 15 Nov 2017 13:16:05 +0000 (UTC)
Subject: [master] 91c675e Clear the objcore attributes flags when
 (re)initializing an stv object
Message-ID: <20171115131605.8D4E1915C0@lists.varnish-cache.org>


commit 91c675e74336dd768c5315806811c97b4469ee31
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Wed Nov 15 14:08:36 2017 +0100

    Clear the objcore attributes flags when (re)initializing an stv object
    
    The oa_present member acts as a filter at the level above the stevedore
    to check set attributes efficiently.
    
    We missed to clear it when recreating freeing an abandoned backend
    fetch object in vcl_backend_error.
    
    Fixes #2319

diff --git a/bin/varnishd/storage/stevedore.c b/bin/varnishd/storage/stevedore.c
index 393486d..7790351 100644
--- a/bin/varnishd/storage/stevedore.c
+++ b/bin/varnishd/storage/stevedore.c
@@ -86,7 +86,7 @@ STV_NewObject(struct worker *wrk, struct objcore *oc,
 	AN(stv->allocobj);
 	if (stv->allocobj(wrk, stv, oc, wsl) == 0)
 		return (0);
-
+	oc->oa_present = 0;
 	wrk->stats->n_object++;
 	VSLb(wrk->vsl, SLT_Storage, "%s %s",
 	    oc->stobj->stevedore->name, oc->stobj->stevedore->ident);
diff --git a/bin/varnishtest/tests/r02319.vtc b/bin/varnishtest/tests/r02319.vtc
new file mode 100644
index 0000000..d49e176
--- /dev/null
+++ b/bin/varnishtest/tests/r02319.vtc
@@ -0,0 +1,37 @@
+varnishtest "Test that oc->oa_present is cleared when we create a new object"
+
+server s1 {
+	rxreq
+	txresp -hdr "Vary: buzz" -nolen -hdr "Content-Length: 10240" \
+	       -body 1024
+} -start
+
+varnish v1 -arg "-p max_retries=1" -vcl+backend {
+	import vtc;
+
+	sub vcl_backend_fetch {
+		set bereq.between_bytes_timeout = 0.0001s;
+	}
+	sub vcl_backend_response {
+		set beresp.do_stream = false;
+	}
+	sub vcl_backend_error {
+		set beresp.storage = storage.Transient;
+		set beresp.status = 200;
+		set beresp.http.source = "vbe";
+		synthetic("synth");
+		set beresp.ttl = 1h;
+		return (deliver);
+	}
+} -start
+
+client c1 {
+	txreq -url "/"
+	rxresp
+	expect resp.status == 200
+} -run
+client c2 {
+	txreq -url "/"
+	rxresp
+	expect resp.status == 200
+} -run

From nils.goroll at uplex.de  Wed Nov 15 13:41:06 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Wed, 15 Nov 2017 13:41:06 +0000 (UTC)
Subject: [master] 20181dd Assign default storage for vcl_backend_error
Message-ID: <20171115134106.874D991EEE@lists.varnish-cache.org>


commit 20181ddd8632743d18d4ffa0f44dab70031f4c27
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Wed Nov 15 14:30:56 2017 +0100

    Assign default storage for vcl_backend_error
    
    Creating "backend synthetic" content was impossible whenever a fetch
    had already started, unless storage was assigned (again) explicitly
    from VCL.
    
    Fixes #2494

diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c
index 9c25e70..2ad7854 100644
--- a/bin/varnishd/cache/cache_fetch.c
+++ b/bin/varnishd/cache/cache_fetch.c
@@ -764,6 +764,9 @@ vbf_stp_error(struct worker *wrk, struct busyobj *bo)
 	if (bo->fetch_objcore->stobj->stevedore != NULL)
 		ObjFreeObj(bo->wrk, bo->fetch_objcore);
 
+	if (bo->storage == NULL)
+		bo->storage = STV_next();
+
 	// XXX: reset all beresp flags ?
 
 	HTTP_Setup(bo->beresp, bo->ws, bo->vsl, SLT_BerespMethod);
diff --git a/bin/varnishtest/tests/r02494.vtc b/bin/varnishtest/tests/r02494.vtc
new file mode 100644
index 0000000..c7e90a3
--- /dev/null
+++ b/bin/varnishtest/tests/r02494.vtc
@@ -0,0 +1,28 @@
+varnishtest "vcl_back_backend_error default storage"
+
+server s1 {
+	rxreq
+	txresp -nolen -hdr "Content-Length: 10240" -body 1024
+} -start
+
+varnish v1 -vcl+backend {
+	sub vcl_backend_response {
+		set beresp.do_stream = false;
+	}
+	sub vcl_backend_error {
+		set beresp.status = 200;
+		set beresp.ttl = 1h;
+		return (deliver);
+	}
+} -start
+
+client c1 {
+	txreq -url "/"
+	rxresp
+	expect resp.status == 200
+} -run
+client c2 {
+	txreq -url "/"
+	rxresp
+	expect resp.status == 200
+} -run

From nils.goroll at uplex.de  Wed Nov 15 13:41:06 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Wed, 15 Nov 2017 13:41:06 +0000 (UTC)
Subject: [master] ef18605 Cleanup testcase
Message-ID: <20171115134106.A1CF091EF2@lists.varnish-cache.org>


commit ef1860543ef9996f74e638146c6cfb5a58fa3c41
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Wed Nov 15 14:22:34 2017 +0100

    Cleanup testcase
    
    I had left in superfluous stuff from bug analysis.
    
    Ref: #2319

diff --git a/bin/varnishtest/tests/r02319.vtc b/bin/varnishtest/tests/r02319.vtc
index d49e176..005ab0f 100644
--- a/bin/varnishtest/tests/r02319.vtc
+++ b/bin/varnishtest/tests/r02319.vtc
@@ -6,9 +6,7 @@ server s1 {
 	       -body 1024
 } -start
 
-varnish v1 -arg "-p max_retries=1" -vcl+backend {
-	import vtc;
-
+varnish v1 -vcl+backend {
 	sub vcl_backend_fetch {
 		set bereq.between_bytes_timeout = 0.0001s;
 	}
@@ -16,10 +14,7 @@ varnish v1 -arg "-p max_retries=1" -vcl+backend {
 		set beresp.do_stream = false;
 	}
 	sub vcl_backend_error {
-		set beresp.storage = storage.Transient;
 		set beresp.status = 200;
-		set beresp.http.source = "vbe";
-		synthetic("synth");
 		set beresp.ttl = 1h;
 		return (deliver);
 	}

From nils.goroll at uplex.de  Wed Nov 15 13:56:04 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Wed, 15 Nov 2017 13:56:04 +0000 (UTC)
Subject: [master] 809a46c complete e8.vtc
Message-ID: <20171115135604.4413A90994@lists.varnish-cache.org>


commit 809a46c1b8184e4fbedfca1200fbca3be99b74d1
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Wed Nov 15 14:53:44 2017 +0100

    complete e8.vtc
    
    ... now that I've found the layer 8 bug
    
    Thank you to @bsdphk
    
    Ref #2484

diff --git a/bin/varnishtest/tests/e00008.vtc b/bin/varnishtest/tests/e00008.vtc
index 1477341..71b700a 100644
--- a/bin/varnishtest/tests/e00008.vtc
+++ b/bin/varnishtest/tests/e00008.vtc
@@ -82,18 +82,18 @@ logexpect l1 -v v1 -g vxid {
 	expect 0 = ESI_xmlerror {^ERR after 665 ESI 1.0 </esi:include> illegal end-tag$}
 	expect 0 = ESI_xmlerror {^ERR after 767 XML 1.0 Missing end attribute delimiter$}
 	expect 0 = BackendReuse
+} -start
 
-## XXX something is fishy about any of: logexpect, vsl, slink's brain:
-## despite syncvsl and the fact that the loggin is output by
-## varnishtest, these fail (time out) - feedback appreciated
-#
-#	expect * * BereqURL	{^/body$}
-#	expect * = ESI_xmlerror {^ERR after 39 VEP ended inside a tag$}
-#	expect 0 = BackendReuse
-#
-#	expect * * BereqURL	{^/body2$}
-#	expect * = ESI_xmlerror {^ERR after 39 VEP ended inside a tag$}
-#	expect 0 = BackendReuse
+logexpect l2 -v v1 -g vxid {
+	expect * * BereqURL	{^/body$}
+	expect * = ESI_xmlerror {^ERR after 30 VEP ended inside a tag$}
+	expect 0 = BackendReuse
+} -start
+
+logexpect l3 -v v1 -g vxid {
+	expect * * BereqURL	{^/body2$}
+	expect * = ESI_xmlerror {^ERR after 39 VEP ended inside a tag$}
+	expect 0 = BackendReuse
 } -start
 
 varnish v1 -cliok "param.set debug +esi_chop"
@@ -109,4 +109,6 @@ client c1 {
 
 client c1 -run
 logexpect l1 -wait
+logexpect l2 -wait
+logexpect l3 -wait
 varnish v1 -expect esi_errors == 17

From nils.goroll at uplex.de  Wed Nov 15 14:13:04 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Wed, 15 Nov 2017 14:13:04 +0000 (UTC)
Subject: [master] 3dc584a Tolerate racing unlinks in vsm cleanup
Message-ID: <20171115141304.4DED891FC6@lists.varnish-cache.org>


commit 3dc584a4ef00aeb2f69478d68a96194538c31b35
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Wed Nov 15 15:04:58 2017 +0100

    Tolerate racing unlinks in vsm cleanup
    
    for example, mgt_shm_atexit could race in two processes, one in
    VSMW_Destroy and the other in system("rm -rf")
    
    Closes #2484

diff --git a/lib/libvarnish/vsmw.c b/lib/libvarnish/vsmw.c
index ee2a443..a778599 100644
--- a/lib/libvarnish/vsmw.c
+++ b/lib/libvarnish/vsmw.c
@@ -221,7 +221,8 @@ vsmw_delseg(struct vsmw *vsmw, struct vsmwseg *seg, int fixidx)
 	AZ(munmap(seg->ptr, len));
 
 	VTAILQ_REMOVE(&vsmw->segs, seg, list);
-	AZ(unlinkat(vsmw->vdirfd, seg->fn, 0));
+	if (unlinkat(vsmw->vdirfd, seg->fn, 0))
+		assert (errno == ENOENT);
 	REPLACE(seg->fn, NULL);
 	REPLACE(seg->class, NULL);
 	REPLACE(seg->id, NULL);
@@ -286,7 +287,8 @@ VSMW_New(int vdirfd, int mode, const char *idxname)
 	vsmw->pid = getpid();
 	vsmw->birth = time(NULL);
 
-	(void)unlinkat(vdirfd, vsmw->idx, 0);
+	if (unlinkat(vdirfd, vsmw->idx, 0))
+		assert (errno == ENOENT);
 	fd = openat(vdirfd,
 	    vsmw->idx, O_APPEND | O_WRONLY | O_CREAT, vsmw->mode);
 	assert(fd >= 0);
@@ -303,7 +305,8 @@ VSMW_Destroy(struct vsmw **pp)
 	struct vsmwseg *seg, *s2;
 
 	TAKE_OBJ_NOTNULL(vsmw, pp, VSMW_MAGIC);
-	AZ(unlinkat(vsmw->vdirfd, vsmw->idx, 0));
+	if (unlinkat(vsmw->vdirfd, vsmw->idx, 0))
+		assert (errno == ENOENT);
 	REPLACE(vsmw->idx, NULL);
 	VTAILQ_FOREACH_SAFE(seg, &vsmw->segs, list, s2)
 		vsmw_delseg(vsmw, seg, 0);

From nils.goroll at uplex.de  Wed Nov 15 14:39:06 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Wed, 15 Nov 2017 14:39:06 +0000 (UTC)
Subject: [master] dce78a8 keep PRIV_* out of vmod documentation
Message-ID: <20171115143906.0E5389196F@lists.varnish-cache.org>


commit dce78a8cfcbbad51bf6eff0794a7f909004530b0
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Wed Nov 15 15:35:47 2017 +0100

    keep PRIV_* out of vmod documentation
    
    Fixes #2448

diff --git a/lib/libvcc/vmodtool.py b/lib/libvcc/vmodtool.py
index bed65e4..9f105f6 100755
--- a/lib/libvcc/vmodtool.py
+++ b/lib/libvcc/vmodtool.py
@@ -86,6 +86,12 @@ CLEANFILES = $(builddir)/vcc_if.c $(builddir)/vcc_if.h \\
 \t$(builddir)/vmod_XXX.man.rst
 
 '''
+privs = {
+    'PRIV_CALL':   "struct vmod_priv *",
+    'PRIV_VCL':    "struct vmod_priv *",
+    'PRIV_TASK':   "struct vmod_priv *",
+    'PRIV_TOP':    "struct vmod_priv *",
+}
 
 ctypes = {
     'ACL':         "VCL_ACL",
@@ -100,10 +106,6 @@ ctypes = {
     'HTTP':        "VCL_HTTP",
     'INT':         "VCL_INT",
     'IP':          "VCL_IP",
-    'PRIV_CALL':   "struct vmod_priv *",
-    'PRIV_VCL':    "struct vmod_priv *",
-    'PRIV_TASK':   "struct vmod_priv *",
-    'PRIV_TOP':    "struct vmod_priv *",
     'PROBE':       "VCL_PROBE",
     'REAL':        "VCL_REAL",
     'STEVEDORE':   "VCL_STEVEDORE",
@@ -113,6 +115,8 @@ ctypes = {
     'VOID':        "VCL_VOID",
 }
 
+ctypes.update(privs)
+
 #######################################################################
 
 
@@ -342,6 +346,8 @@ class prototype(object):
         l = []
         for i in self.args:
             t = i.vcl()
+            if t in privs:
+                continue
             if not short:
                 if i.nm is not None:
                     t += " " + i.nm

From phk at FreeBSD.org  Thu Nov 16 08:03:04 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Thu, 16 Nov 2017 08:03:04 +0000 (UTC)
Subject: [master] b6f071a Rename this (minimal) base64 implementation to
 enforce uniqueness of sourcefile names over the project.
Message-ID: <20171116080304.685EB912F7@lists.varnish-cache.org>


commit b6f071ad57aa36ee06271e0b224168c2c2af8b95
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Nov 16 08:01:37 2017 +0000

    Rename this (minimal) base64 implementation to enforce uniqueness
    of sourcefile names over the project.

diff --git a/bin/varnishncsa/Makefile.am b/bin/varnishncsa/Makefile.am
index cbed83b..60345be 100644
--- a/bin/varnishncsa/Makefile.am
+++ b/bin/varnishncsa/Makefile.am
@@ -9,8 +9,8 @@ bin_PROGRAMS = varnishncsa
 varnishncsa_SOURCES = \
 	varnishncsa.c \
 	varnishncsa_options.h \
-	base64.h \
-	base64.c
+	b64.h \
+	b64.c
 
 varnishncsa_CFLAGS = \
 	@SAN_CFLAGS@
diff --git a/bin/varnishncsa/b64.c b/bin/varnishncsa/b64.c
new file mode 100644
index 0000000..5d398f4
--- /dev/null
+++ b/bin/varnishncsa/b64.c
@@ -0,0 +1,90 @@
+/*
+ * Written by Poul-Henning Kamp <phk at phk.freebsd.dk>
+ *
+ * This file is in the public domain.
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "b64.h"
+
+static const char b64[] =
+    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+static char i64[256];
+
+void
+VB64_init(void)
+{
+	int i;
+	const char *p;
+
+	for (i = 0; i < 256; i++)
+		i64[i] = -1;
+	for (p = b64, i = 0; *p; p++, i++)
+		i64[(int)*p] = (char)i;
+	i64['='] = 0;
+}
+
+int
+VB64_decode(char *d, unsigned dlen, const char *s, const char *e)
+{
+	unsigned u, v, l;
+	int i;
+
+	if (e == NULL)
+		e = s + strlen(s);
+	u = 0;
+	l = 0;
+	while (s < e) {
+		for (v = 0; s < e && v < 4; v++) {
+			i = i64[(int)*s++];
+			if (i < 0)
+				return (-1);
+			u <<= 6;
+			u |= i;
+		}
+		for (v = 0; v < 3; v++) {
+			if (l >= dlen - 1)
+				return (-1);
+			*d = (u >> 16) & 0xff;
+			u <<= 8;
+			l++;
+			d++;
+		}
+	}
+	*d = '\0';
+	return (0);
+}
+
+#ifdef TEST_DRIVER
+
+#include <stdio.h>		// for test-prog
+
+const char *test1 =
+"TWFuIGlzIGRpc3Rpbmd1aXNoZWQsIG5vdCBvbmx5IGJ5IGhpcyByZWFzb24sIGJ1dCBieSB0aGlz"
+"IHNpbmd1bGFyIHBhc3Npb24gZnJvbSBvdGhlciBhbmltYWxzLCB3aGljaCBpcyBhIGx1c3Qgb2Yg"
+"dGhlIG1pbmQsIHRoYXQgYnkgYSBwZXJzZXZlcmFuY2Ugb2YgZGVsaWdodCBpbiB0aGUgY29udGlu"
+"dWVkIGFuZCBpbmRlZmF0aWdhYmxlIGdlbmVyYXRpb24gb2Yga25vd2xlZGdlLCBleGNlZWRzIHRo"
+"ZSBzaG9ydCB2ZWhlbWVuY2Ugb2YgYW55IGNhcm5hbCBwbGVhc3VyZS4=";
+
+int
+main(int argc, char **argv)
+{
+	int i;
+	char buf[BUFSIZ];
+	unsigned l;
+
+	(void)argc;
+	(void)argv;
+
+	VB64_init();
+	l = sizeof buf;
+	VB64_decode(buf, l, test1, NULL);
+	printf("%s\n", buf);
+	return (0);
+}
+#endif
diff --git a/bin/varnishncsa/b64.h b/bin/varnishncsa/b64.h
new file mode 100644
index 0000000..526ae19
--- /dev/null
+++ b/bin/varnishncsa/b64.h
@@ -0,0 +1,32 @@
+/*-
+ * Copyright (c) 2006 Verdens Gang AS
+ * Copyright (c) 2006-2011 Varnish Software AS
+ * All rights reserved.
+ *
+ * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ */
+
+void VB64_init(void);
+int VB64_decode(char *d, unsigned dlen, const char *s, const char *e);
diff --git a/bin/varnishncsa/base64.c b/bin/varnishncsa/base64.c
deleted file mode 100644
index d7b2b89..0000000
--- a/bin/varnishncsa/base64.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Written by Poul-Henning Kamp <phk at phk.freebsd.dk>
- *
- * This file is in the public domain.
- */
-
-#include "config.h"
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "base64.h"
-
-static const char b64[] =
-    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-static char i64[256];
-
-void
-VB64_init(void)
-{
-	int i;
-	const char *p;
-
-	for (i = 0; i < 256; i++)
-		i64[i] = -1;
-	for (p = b64, i = 0; *p; p++, i++)
-		i64[(int)*p] = (char)i;
-	i64['='] = 0;
-}
-
-int
-VB64_decode(char *d, unsigned dlen, const char *s, const char *e)
-{
-	unsigned u, v, l;
-	int i;
-
-	if (e == NULL)
-		e = s + strlen(s);
-	u = 0;
-	l = 0;
-	while (s < e) {
-		for (v = 0; s < e && v < 4; v++) {
-			i = i64[(int)*s++];
-			if (i < 0)
-				return (-1);
-			u <<= 6;
-			u |= i;
-		}
-		for (v = 0; v < 3; v++) {
-			if (l >= dlen - 1)
-				return (-1);
-			*d = (u >> 16) & 0xff;
-			u <<= 8;
-			l++;
-			d++;
-		}
-	}
-	*d = '\0';
-	return (0);
-}
-
-#ifdef TEST_DRIVER
-
-#include <stdio.h>		// for test-prog
-
-const char *test1 =
-"TWFuIGlzIGRpc3Rpbmd1aXNoZWQsIG5vdCBvbmx5IGJ5IGhpcyByZWFzb24sIGJ1dCBieSB0aGlz"
-"IHNpbmd1bGFyIHBhc3Npb24gZnJvbSBvdGhlciBhbmltYWxzLCB3aGljaCBpcyBhIGx1c3Qgb2Yg"
-"dGhlIG1pbmQsIHRoYXQgYnkgYSBwZXJzZXZlcmFuY2Ugb2YgZGVsaWdodCBpbiB0aGUgY29udGlu"
-"dWVkIGFuZCBpbmRlZmF0aWdhYmxlIGdlbmVyYXRpb24gb2Yga25vd2xlZGdlLCBleGNlZWRzIHRo"
-"ZSBzaG9ydCB2ZWhlbWVuY2Ugb2YgYW55IGNhcm5hbCBwbGVhc3VyZS4=";
-
-int
-main(int argc, char **argv)
-{
-	int i;
-	char buf[BUFSIZ];
-	unsigned l;
-
-	(void)argc;
-	(void)argv;
-
-	VB64_init();
-	l = sizeof buf;
-	VB64_decode(buf, l, test1, NULL);
-	printf("%s\n", buf);
-	return (0);
-}
-#endif
diff --git a/bin/varnishncsa/base64.h b/bin/varnishncsa/base64.h
deleted file mode 100644
index 526ae19..0000000
--- a/bin/varnishncsa/base64.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*-
- * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2011 Varnish Software AS
- * All rights reserved.
- *
- * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-
-void VB64_init(void);
-int VB64_decode(char *d, unsigned dlen, const char *s, const char *e);
diff --git a/bin/varnishncsa/varnishncsa.c b/bin/varnishncsa/varnishncsa.c
index 18eec35..cc5cb05 100644
--- a/bin/varnishncsa/varnishncsa.c
+++ b/bin/varnishncsa/varnishncsa.c
@@ -57,7 +57,7 @@
 #define VOPT_DEFINITION
 #define VOPT_INC "varnishncsa_options.h"
 
-#include "base64.h"
+#include "b64.h"
 #include "vapi/vsl.h"
 #include "vapi/voptget.h"
 #include "vas.h"

From phk at FreeBSD.org  Thu Nov 16 08:41:05 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Thu, 16 Nov 2017 08:41:05 +0000 (UTC)
Subject: [master] 5d48d91 More coverage of vmod_vtc
Message-ID: <20171116084105.EC11291A61@lists.varnish-cache.org>


commit 5d48d91e2bac264f3ca8a79dd809558ac35da0f2
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Nov 16 08:39:50 2017 +0000

    More coverage of vmod_vtc

diff --git a/bin/varnishtest/tests/c00070.vtc b/bin/varnishtest/tests/c00070.vtc
index 973af28..6593569 100644
--- a/bin/varnishtest/tests/c00070.vtc
+++ b/bin/varnishtest/tests/c00070.vtc
@@ -10,6 +10,11 @@ server s1 {
 
 varnish v1 -vcl+backend {
 	import vtc;
+	sub vcl_recv {
+		if (req.url == "/overflow") {
+			vtc.workspace_alloc(client, 100000000);
+		}
+	}
 	sub vcl_backend_response {
 		set beresp.http.free_backend = vtc.workspace_free(backend);
 	}
@@ -29,7 +34,7 @@ varnish v1 -vcl+backend {
 
 logexpect l1 -v v1 -d 1 -g vxid -q "Error ~ 'overflow'" {
 	expect 0 *	Begin
-	expect * =	Error	"workspace_client overflow"
+	expect * =	Error		"workspace_client overflow"
 	expect * =	End
 } -start
 
@@ -43,10 +48,22 @@ client c1 {
 	expect resp.http.free_thread > 2000
 } -run
 
-client c2 {
+client c1 {
 	txreq -url /bar
 	rxresp
 	expect resp.status == 500
 } -run
 
 logexpect l1 -wait
+
+logexpect l2 -v v1 -d 1 -g vxid  {
+	expect * 1007	VCL_Error
+} -start
+
+client c1 {
+	txreq -url /overflow
+	rxresp
+	expect resp.status == 503
+} -run
+
+logexpect l2 -wait
diff --git a/bin/varnishtest/tests/m00000.vtc b/bin/varnishtest/tests/m00000.vtc
index 2dbe456..6200b80 100644
--- a/bin/varnishtest/tests/m00000.vtc
+++ b/bin/varnishtest/tests/m00000.vtc
@@ -24,6 +24,7 @@ varnish v1 -vcl+backend {
 		set resp.http.bar = std.tolower(resp.http.bar);
 		set resp.http.who = debug.author(phk);
 		set resp.http.what = vtc.typesize("dfijlopsz");
+		set resp.http.not = vtc.typesize("*");
 		debug.test_priv_call();
 		debug.test_priv_vcl();
 		obj.test_priv_call();
@@ -43,6 +44,7 @@ client c1 {
 	expect resp.http.bar == "foo"
 	expect resp.http.encrypted == "ROT52"
 	expect resp.http.what >= 16
+	expect resp.http.not == -1
 } -run
 
 logexpect l1 -v v1 -g raw -d 1 {
@@ -53,6 +55,7 @@ logexpect l1 -v v1 -g raw -d 1 {
 	expect 0 =    RespHeader	{^bar: foo}
 	expect 0 =    RespHeader	{^who: Poul-Henning}
 	expect 0 =    RespHeader	{^what: [1-9][0-9]}
+	expect 0 =    RespHeader	{^not: -1}
 	expect 0 =    VCL_Log		{^VCL initiated log}
 	expect 0 =    RespHeader	{^Encrypted: ROT52}
 	expect 0 =    VCL_return	{^deliver}
diff --git a/lib/libvmod_vtc/vmod_vtc.c b/lib/libvmod_vtc/vmod_vtc.c
index e8fbf61..c91eb2e 100644
--- a/lib/libvmod_vtc/vmod_vtc.c
+++ b/lib/libvmod_vtc/vmod_vtc.c
@@ -131,9 +131,7 @@ vtc_ws_find(VRT_CTX, VCL_ENUM which)
 		return (ctx->req->sp->ws);
 	if (!strcmp(which, "thread"))
 		return (ctx->req->wrk->aws);
-
-	VRT_fail(ctx, "Unknown workspace: '%s'", which);
-	return (NULL);
+	WRONG("vtc_ws_find Illegal enum");
 }
 
 VCL_VOID __match_proto__(td_vtc_workspace_alloc)

From phk at FreeBSD.org  Thu Nov 16 11:03:07 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Thu, 16 Nov 2017 11:03:07 +0000 (UTC)
Subject: [master] 86105f6 Update libvgz and neuter the adler32 bits we do not
 use.
Message-ID: <20171116110307.1298991716@lists.varnish-cache.org>


commit 86105f6981f3c774ae14c871ad8f61dc9ec1d3af
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Nov 16 11:02:12 2017 +0000

    Update libvgz and neuter the adler32 bits we do not use.

diff --git a/lib/libvgz/adler32.c b/lib/libvgz/adler32.c
index d0be438..5f5e0de 100644
--- a/lib/libvgz/adler32.c
+++ b/lib/libvgz/adler32.c
@@ -7,6 +7,7 @@
 
 #include "zutil.h"
 
+#ifdef NOVGZ
 local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2));
 
 #define BASE 65521U     /* largest prime smaller than 65536 */
@@ -184,3 +185,15 @@ uLong ZEXPORT adler32_combine64(adler1, adler2, len2)
 {
     return adler32_combine_(adler1, adler2, len2);
 }
+#else
+uLong ZEXPORT adler32(adler, buf, len)
+    uLong adler;
+    const Bytef *buf;
+    uInt len;
+{
+	(void)adler;
+	(void)buf;
+	(void)len;
+	abort();
+}
+#endif
diff --git a/lib/libvgz/deflate.c b/lib/libvgz/deflate.c
index 4fce32a..0b300c7 100644
--- a/lib/libvgz/deflate.c
+++ b/lib/libvgz/deflate.c
@@ -511,7 +511,7 @@ int ZEXPORT deflateResetKeep (strm)
         s->wrap == 2 ? crc32(0L, Z_NULL, 0) :
 #endif
         adler32(0L, Z_NULL, 0);
-    s->last_flush = Z_NO_FLUSH;
+    s->last_flush = -2;
 
     _tr_init(s);
 
@@ -606,12 +606,12 @@ int ZEXPORT deflateParams(strm, level, strategy)
     func = configuration_table[s->level].func;
 
     if ((strategy != s->strategy || func != configuration_table[level].func) &&
-        s->high_water) {
+        s->last_flush != -2) {
         /* Flush the last buffer: */
         int err = deflate(strm, Z_BLOCK);
         if (err == Z_STREAM_ERROR)
             return err;
-        if (strm->avail_out == 0)
+        if (strm->avail_in || (s->strstart - s->block_start) + s->lookahead)
             return Z_BUF_ERROR;
     }
     if (s->level != level) {
diff --git a/lib/libvgz/trees.c b/lib/libvgz/trees.c
index 92a50f2..a11cd0d 100644
--- a/lib/libvgz/trees.c
+++ b/lib/libvgz/trees.c
@@ -122,13 +122,13 @@ struct static_tree_desc_s {
     int     max_length;          /* max bit length for the codes */
 };
 
-local static_tree_desc  static_l_desc =
+local const static_tree_desc  static_l_desc =
 {static_ltree, extra_lbits, LITERALS+1, L_CODES, MAX_BITS};
 
-local static_tree_desc  static_d_desc =
+local const static_tree_desc  static_d_desc =
 {static_dtree, extra_dbits, 0,          D_CODES, MAX_BITS};
 
-local static_tree_desc  static_bl_desc =
+local const static_tree_desc  static_bl_desc =
 {(const ct_data *)0, extra_blbits, 0,   BL_CODES, MAX_BL_BITS};
 
 /* ===========================================================================
diff --git a/lib/libvgz/vgz.h b/lib/libvgz/vgz.h
index dc3e126..86831ee 100644
--- a/lib/libvgz/vgz.h
+++ b/lib/libvgz/vgz.h
@@ -716,11 +716,12 @@ ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
    used to switch between compression and straight copy of the input data, or
    to switch to a different kind of input data requiring a different strategy.
    If the compression approach (which is a function of the level) or the
-   strategy is changed, and if any input has been consumed in a previous
-   deflate() call, then the input available so far is compressed with the old
-   level and strategy using deflate(strm, Z_BLOCK).  There are three approaches
-   for the compression levels 0, 1..3, and 4..9 respectively.  The new level
-   and strategy will take effect at the next call of deflate().
+   strategy is changed, and if there have been any deflate() calls since the
+   state was initialized or reset, then the input available so far is
+   compressed with the old level and strategy using deflate(strm, Z_BLOCK).
+   There are three approaches for the compression levels 0, 1..3, and 4..9
+   respectively.  The new level and strategy will take effect at the next call
+   of deflate().
 
      If a deflate(strm, Z_BLOCK) is performed by deflateParams(), and it does
    not have enough output space to complete, then the parameter change will not
diff --git a/tools/cmp_libz.sh b/tools/cmp_libz.sh
new file mode 100644
index 0000000..b9c5c6b
--- /dev/null
+++ b/tools/cmp_libz.sh
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+# This script compares libvgz to zlib in FreeBSD source tree
+
+LZ=/usr/src/contrib/zlib
+
+if [ ! -d lib/libvgz ] ; then
+	echo "Run this from to of tree" 1>&2
+	exit 2
+fi
+
+for i in lib/libvgz/*.[ch]
+do
+	b=`basename $i`
+	if [ "$b" == "vgz.h" ] ; then
+		b="zlib.h"
+	fi
+	if [ -f ${LZ}/$b ] ; then
+		echo "==== $b"
+		sed '
+		s/vgz.h/zlib.h/
+		/strm->msg =/s/"/(char *)"/
+		' $i |
+		diff -u ${LZ}/$b -
+	else
+		echo "#### $b #### NOT FOUND ####"
+	fi
+done

From phk at FreeBSD.org  Thu Nov 16 11:51:05 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Thu, 16 Nov 2017 11:51:05 +0000 (UTC)
Subject: [master] b54b740 Disable more bits of libvgz we never use.
Message-ID: <20171116115105.883A191791@lists.varnish-cache.org>


commit b54b740bf91d87ffe2780257e2a83ac134a2f798
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Nov 16 11:49:45 2017 +0000

    Disable more bits of libvgz we never use.

diff --git a/lib/libvgz/deflate.c b/lib/libvgz/deflate.c
index 0b300c7..b40a64e 100644
--- a/lib/libvgz/deflate.c
+++ b/lib/libvgz/deflate.c
@@ -374,10 +374,10 @@ local int deflateStateCheck (strm)
 #ifdef GZIP
                                            s->status != GZIP_STATE &&
 #endif
-                                           s->status != EXTRA_STATE &&
-                                           s->status != NAME_STATE &&
-                                           s->status != COMMENT_STATE &&
-                                           s->status != HCRC_STATE &&
+                                           // s->status != EXTRA_STATE &&
+                                           // s->status != NAME_STATE &&
+                                           // s->status != COMMENT_STATE &&
+                                           // s->status != HCRC_STATE &&
                                            s->status != BUSY_STATE &&
                                            s->status != FINISH_STATE))
         return 1;
@@ -893,6 +893,10 @@ int ZEXPORT deflate (strm, flush)
             }
         }
         else {
+		abort();
+	}
+    }
+#ifdef NOVGZ
             put_byte(s, (s->gzhead->text ? 1 : 0) +
                      (s->gzhead->hcrc ? 2 : 0) +
                      (s->gzhead->extra == Z_NULL ? 0 : 4) +
@@ -1011,6 +1015,7 @@ int ZEXPORT deflate (strm, flush)
         }
     }
 #endif
+#endif
 
     if (strm->start_bit == 0)
         strm->start_bit = (strm->total_out + s->pending) * 8 + s->bi_valid;

From martin at varnish-software.com  Thu Nov 16 12:41:05 2017
From: martin at varnish-software.com (Martin Blix Grydeland)
Date: Thu, 16 Nov 2017 12:41:05 +0000 (UTC)
Subject: [master] b76aae4 PPC requires a larger file storage
Message-ID: <20171116124105.7312A91AB2@lists.varnish-cache.org>


commit b76aae445d7ca956d96006deff39711d620ac1af
Author: Martin Blix Grydeland <martin at varnish-software.com>
Date:   Thu Nov 16 13:39:06 2017 +0100

    PPC requires a larger file storage
    
    I'm guessing this is due to rounding. All test cases involving file
    stevedore has a minimum 10m file in the test, was silly to attempt a
    smaller one in this test.
    
    Fixes: #2496

diff --git a/bin/varnishtest/tests/r02429.vtc b/bin/varnishtest/tests/r02429.vtc
index 02c8450..81e42f0 100644
--- a/bin/varnishtest/tests/r02429.vtc
+++ b/bin/varnishtest/tests/r02429.vtc
@@ -4,7 +4,7 @@ server s1 {
 	accept
 } -start
 
-varnish v1 -arg "-s Transient=file,${tmpdir}/_.file,1m" -vcl+backend {
+varnish v1 -arg "-s Transient=file,${tmpdir}/_.file,10m" -vcl+backend {
 	sub vcl_backend_error {
 		synthetic("foo");
 		return (deliver);

From daghf at varnish-software.com  Thu Nov 16 13:38:06 2017
From: daghf at varnish-software.com (Dag Haavi Finstad)
Date: Thu, 16 Nov 2017 13:38:06 +0000 (UTC)
Subject: [master] 222ad8c Stabilize v00010.vtc
Message-ID: <20171116133806.D96C592000@lists.varnish-cache.org>


commit 222ad8c310bd22fab4d8b2e3f7f0cec63be27915
Author: Dag Haavi Finstad <daghf at varnish-software.com>
Date:   Thu Nov 16 14:37:08 2017 +0100

    Stabilize v00010.vtc

diff --git a/bin/varnishtest/tests/v00010.vtc b/bin/varnishtest/tests/v00010.vtc
index 7e14464..51f9e65 100644
--- a/bin/varnishtest/tests/v00010.vtc
+++ b/bin/varnishtest/tests/v00010.vtc
@@ -41,6 +41,7 @@ varnish v1 -arg "-sdefault,1m" -vcl+backend {
 
 varnish v1 -cliok "stop"
 varnish v1 -cliok "start"
+varnish v1 -wait-running
 varnish v1 -expect MGT.child_panic == 0
 varnish v1 -cliok "param.set feature +no_coredump"
 

From hermunn at varnish-software.com  Fri Nov 17 12:58:09 2017
From: hermunn at varnish-software.com (Pål Hermunn Johansen)
Date: Fri, 17 Nov 2017 12:58:09 +0000 (UTC)
Subject: [master] 1d62f5d Add cache_hit_grace counter
Message-ID: <20171117125809.ADCD591063@lists.varnish-cache.org>


commit 1d62f5da43a245966faff82f3ee3e6cff46db0f2
Author: P?l Hermunn Johansen <hermunn at varnish-software.com>
Date:   Fri Nov 17 13:47:28 2017 +0100

    Add cache_hit_grace counter
    
    The counter cache_hit_grace counts the number of grace hits. To be
    precise, it counts the number of times lookup returns an expired
    object, but vcl_hit is called and decides to return(deliver).
    
    Every time cache_hit_grace is incremented, cache_hit is also
    incremented (so this commit does not change the cache_hit counter).

diff --git a/bin/varnishd/VSC_main.vsc b/bin/varnishd/VSC_main.vsc
index ca999f7..f303453 100644
--- a/bin/varnishd/VSC_main.vsc
+++ b/bin/varnishd/VSC_main.vsc
@@ -56,6 +56,13 @@
 	Count of cache hits.  A cache hit indicates that an object has been
 	delivered to a client without fetching it from a backend server.
 
+.. varnish_vsc:: cache_hit_grace
+	:oneliner:	Cache grace hits
+
+	Count of cache hits with grace. A cache hit with grace is a cache
+	hit where the object is expired. Note that such hits are also
+	included in the cache_hit counter.
+
 .. varnish_vsc:: cache_hitpass
 	:oneliner:	Cache hits for pass.
 
diff --git a/bin/varnishd/cache/cache_req_fsm.c b/bin/varnishd/cache/cache_req_fsm.c
index 95dafbd..8e9b019 100644
--- a/bin/varnishd/cache/cache_req_fsm.c
+++ b/bin/varnishd/cache/cache_req_fsm.c
@@ -523,6 +523,8 @@ cnt_lookup(struct worker *wrk, struct req *req)
 		}
 		wrk->stats->cache_hit++;
 		req->is_hit = 1;
+		if (lr == HSH_EXP || lr == HSH_EXPBUSY)
+			wrk->stats->cache_hit_grace++;
 		req->req_step = R_STP_DELIVER;
 		return (REQ_FSM_MORE);
 	case VCL_RET_MISS:
diff --git a/bin/varnishtest/tests/b00052.vtc b/bin/varnishtest/tests/b00052.vtc
new file mode 100644
index 0000000..23cfcf5
--- /dev/null
+++ b/bin/varnishtest/tests/b00052.vtc
@@ -0,0 +1,52 @@
+varnishtest "The cache_hit_grace counter"
+
+server s1 {
+	# normal fetch
+	rxreq
+	expect req.url == "/1"
+	txresp -hdr "Age: 1" -hdr "Cache-Control: max-age=2" -body "1"
+
+	# background fetch:
+	rxreq
+	expect req.url == "/1"
+	txresp -body "2"
+
+	# normal fetch
+	rxreq
+	expect req.url == "/2"
+	txresp
+} -start
+
+varnish v1 -vcl+backend { } -start
+
+client c1 {
+	txreq -url "/1"
+	rxresp
+	expect resp.body == "1"
+} -run
+
+delay 2
+
+# Get a grace hit, will trigger a background fetch
+
+client c2 {
+	txreq -url "/1"
+	rxresp
+	expect resp.body == "1"
+} -run
+
+delay 2
+
+client c3 {
+	txreq -url "/2"
+	rxresp
+	txreq -url "/1"
+	rxresp
+	expect resp.body == "2"
+} -run
+
+# Check that counters are correct:
+
+varnish v1 -expect cache_hit == 2
+varnish v1 -expect cache_hit_grace == 1
+varnish v1 -expect cache_miss == 2

From phk at FreeBSD.org  Sat Nov 18 17:36:09 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Sat, 18 Nov 2017 17:36:09 +0000 (UTC)
Subject: [master] 6356fb4 Add the binheap test to make check
Message-ID: <20171118173609.A325991D99@lists.varnish-cache.org>


commit 6356fb41d12d249a96ce39cfce4492756d21dae4
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Sat Nov 18 17:34:42 2017 +0000

    Add the binheap test to make check

diff --git a/lib/libvarnish/Makefile.am b/lib/libvarnish/Makefile.am
index bbef1a2..7570fa0 100644
--- a/lib/libvarnish/Makefile.am
+++ b/lib/libvarnish/Makefile.am
@@ -40,10 +40,13 @@ libvarnish_a_SOURCES = \
 	vtcp.c \
 	vtim.c
 
-TESTS = vnum_c_test
+TESTS = vnum_c_test binheap
 
 noinst_PROGRAMS = ${TESTS}
 
+binheap_SOURCES = binary_heap.c
+binheap_CFLAGS = -DTEST_DRIVER
+
 vnum_c_test_SOURCES = vnum.c vas.c
 vnum_c_test_CFLAGS = -DNUM_C_TEST -include config.h
 vnum_c_test_LDADD = ${LIBM}
diff --git a/lib/libvarnish/binary_heap.c b/lib/libvarnish/binary_heap.c
index 94de6f8..196ac6e 100644
--- a/lib/libvarnish/binary_heap.c
+++ b/lib/libvarnish/binary_heap.c
@@ -40,8 +40,8 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "binary_heap.h"
 #include "vas.h"
+#include "binary_heap.h"
 
 /* Parameters --------------------------------------------------------*/
 
@@ -458,6 +458,7 @@ binheap_reorder(const struct binheap *bh, unsigned idx)
 #include <stdio.h>
 #include <strings.h>
 
+#include "vdef.h"
 #include "miniobj.h"
 
 /* Test driver -------------------------------------------------------*/
@@ -481,37 +482,34 @@ struct foo {
 	unsigned	n;
 };
 
-#if 1
-#define M 31011091	/* Number of operations */
-#define N 17313102	/* Number of items */
-#else
-#define M 3401		/* Number of operations */
-#define N 1131		/* Number of items */
-#endif
+#define M 153557	/* Number of operations */
+#define N 43117		/* Number of items */
 #define R -1		/* Random modulus */
 
 struct foo *ff[N];
 
-static int
+static int __match_proto__(binheap_cmp_t)
 cmp(void *priv, const void *a, const void *b)
 {
 	const struct foo *fa, *fb;
 
+	(void)priv;
 	CAST_OBJ_NOTNULL(fa, a, FOO_MAGIC);
 	CAST_OBJ_NOTNULL(fb, b, FOO_MAGIC);
 	return (fa->key < fb->key);
 }
 
-void
+static void __match_proto__(binheap_update_t)
 update(void *priv, void *a, unsigned u)
 {
 	struct foo *fa;
 
+	(void)priv;
 	CAST_OBJ_NOTNULL(fa, a, FOO_MAGIC);
 	fa->idx = u;
 }
 
-void
+static void
 chk2(struct binheap *bh)
 {
 	unsigned u, v;
@@ -529,9 +527,11 @@ int
 main(int argc, char **argv)
 {
 	struct binheap *bh;
-	unsigned u, v, lr, n;
+	unsigned j, u, v, lr, n;
 	struct foo *fp;
 
+	(void)argc;
+	(void)argv;
 	if (0) {
 		srandomdev();
 		u = random();
@@ -545,7 +545,7 @@ main(int argc, char **argv)
 		child(bh, n + 1, &u, &v);
 	}
 
-	while (1) {
+	for(j = 0; j < 2; j++) {
 		/* First insert our N elements */
 		for (u = 0; u < N; u++) {
 			lr = random() % R;

From phk at FreeBSD.org  Sat Nov 18 17:38:04 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Sat, 18 Nov 2017 17:38:04 +0000 (UTC)
Subject: [master] b7588cd include <string.h> not <strings.h>
Message-ID: <20171118173804.8726491FE0@lists.varnish-cache.org>


commit b7588cd0d5d826351b71c52d8615b4be1faf91ad
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Sat Nov 18 17:36:48 2017 +0000

    include <string.h> not <strings.h>

diff --git a/lib/libvarnish/binary_heap.c b/lib/libvarnish/binary_heap.c
index 196ac6e..b19516c 100644
--- a/lib/libvarnish/binary_heap.c
+++ b/lib/libvarnish/binary_heap.c
@@ -456,7 +456,7 @@ binheap_reorder(const struct binheap *bh, unsigned idx)
 #ifdef TEST_DRIVER
 
 #include <stdio.h>
-#include <strings.h>
+#include <string.h>
 
 #include "vdef.h"
 #include "miniobj.h"

From phk at FreeBSD.org  Sat Nov 18 17:44:04 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Sat, 18 Nov 2017 17:44:04 +0000 (UTC)
Subject: [master] 8aadee2 Compile vas.c into the binheap test-program instead
 of home-rolling.
Message-ID: <20171118174404.3EE70922B3@lists.varnish-cache.org>


commit 8aadee2d4da1ece1c11d16171f85b82b20c9abd6
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Sat Nov 18 17:42:54 2017 +0000

    Compile vas.c into the binheap test-program instead of home-rolling.

diff --git a/lib/libvarnish/Makefile.am b/lib/libvarnish/Makefile.am
index 7570fa0..ecd5a6a 100644
--- a/lib/libvarnish/Makefile.am
+++ b/lib/libvarnish/Makefile.am
@@ -44,7 +44,7 @@ TESTS = vnum_c_test binheap
 
 noinst_PROGRAMS = ${TESTS}
 
-binheap_SOURCES = binary_heap.c
+binheap_SOURCES = binary_heap.c vas.c
 binheap_CFLAGS = -DTEST_DRIVER
 
 vnum_c_test_SOURCES = vnum.c vas.c
diff --git a/lib/libvarnish/binary_heap.c b/lib/libvarnish/binary_heap.c
index b19516c..8171a8a 100644
--- a/lib/libvarnish/binary_heap.c
+++ b/lib/libvarnish/binary_heap.c
@@ -463,17 +463,6 @@ binheap_reorder(const struct binheap *bh, unsigned idx)
 
 /* Test driver -------------------------------------------------------*/
 
-void __attribute__((__noreturn__))
-VAS_Fail(const char *func, const char *file, int line,
-    const char *cond, enum vas_e what)
-{
-	fprintf(stderr, "PANIC: %s %s %d %s %d\n",
-		func, file, line, cond, what);
-	abort();
-}
-
-vas_f *VAS_Fail_Func = VAS_Fail;
-
 struct foo {
 	unsigned	magic;
 #define FOO_MAGIC	0x23239823

From phk at FreeBSD.org  Sat Nov 18 17:50:05 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Sat, 18 Nov 2017 17:50:05 +0000 (UTC)
Subject: [master] 4691f58 Use VRND for random test-data
Message-ID: <20171118175005.40117925A4@lists.varnish-cache.org>


commit 4691f58393156650cfb41735beff7d5b80017d66
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Sat Nov 18 17:48:56 2017 +0000

    Use VRND for random test-data

diff --git a/lib/libvarnish/Makefile.am b/lib/libvarnish/Makefile.am
index ecd5a6a..c772bf5 100644
--- a/lib/libvarnish/Makefile.am
+++ b/lib/libvarnish/Makefile.am
@@ -44,7 +44,7 @@ TESTS = vnum_c_test binheap
 
 noinst_PROGRAMS = ${TESTS}
 
-binheap_SOURCES = binary_heap.c vas.c
+binheap_SOURCES = binary_heap.c vas.c vrnd.c
 binheap_CFLAGS = -DTEST_DRIVER
 
 vnum_c_test_SOURCES = vnum.c vas.c
diff --git a/lib/libvarnish/binary_heap.c b/lib/libvarnish/binary_heap.c
index 8171a8a..77cd823 100644
--- a/lib/libvarnish/binary_heap.c
+++ b/lib/libvarnish/binary_heap.c
@@ -459,6 +459,7 @@ binheap_reorder(const struct binheap *bh, unsigned idx)
 #include <string.h>
 
 #include "vdef.h"
+#include "vrnd.h"
 #include "miniobj.h"
 
 /* Test driver -------------------------------------------------------*/
@@ -521,12 +522,7 @@ main(int argc, char **argv)
 
 	(void)argc;
 	(void)argv;
-	if (0) {
-		srandomdev();
-		u = random();
-		printf("Seed %u\n", u);
-		srandom(u);
-	}
+	VRND_SeedAll();
 	bh = binheap_new(NULL, cmp, update);
 	for (n = 2; n; n += n) {
 		child(bh, n - 1, &u, &v);
@@ -537,7 +533,7 @@ main(int argc, char **argv)
 	for(j = 0; j < 2; j++) {
 		/* First insert our N elements */
 		for (u = 0; u < N; u++) {
-			lr = random() % R;
+			lr = VRND_RandomTestable() % R;
 			ALLOC_OBJ(ff[u], FOO_MAGIC);
 			assert(ff[u] != NULL);
 			ff[u]->key = lr;
@@ -569,7 +565,7 @@ main(int argc, char **argv)
 			fp = ff[n];
 			fp->n = n;
 
-			lr = random() % R;
+			lr = VRND_RandomTestable() % R;
 			fp->key = lr;
 			binheap_insert(bh, fp);
 		}
@@ -589,7 +585,7 @@ main(int argc, char **argv)
 		fprintf(stderr, "%d removes OK\n", N);
 
 		for (u = 0; u < M; u++) {
-			v = random() % N;
+			v = VRND_RandomTestable() % N;
 			if (ff[v] != NULL) {
 				CHECK_OBJ_NOTNULL(ff[v], FOO_MAGIC);
 				AN(ff[v]->idx);
@@ -599,13 +595,13 @@ main(int argc, char **argv)
 					FREE_OBJ(ff[v]);
 					ff[v] = NULL;
 				} else {
-					ff[v]->key = random() % R;
+					ff[v]->key = VRND_RandomTestable() % R;
 					binheap_reorder(bh, ff[v]->idx);
 				}
 			} else {
 				ALLOC_OBJ(ff[v], FOO_MAGIC);
 				assert(ff[v] != NULL);
-				ff[v]->key = random() % R;
+				ff[v]->key = VRND_RandomTestable() % R;
 				binheap_insert(bh, ff[v]);
 				CHECK_OBJ_NOTNULL(ff[v], FOO_MAGIC);
 				AN(ff[v]->idx);

From phk at FreeBSD.org  Sat Nov 18 21:00:12 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Sat, 18 Nov 2017 21:00:12 +0000 (UTC)
Subject: [master] bb19138 Get out into the corners of binheap
Message-ID: <20171118210012.9D02291ED8@lists.varnish-cache.org>


commit bb19138ade9b8b709d09c1f39a5bf89e7973780e
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Sat Nov 18 20:58:54 2017 +0000

    Get out into the corners of binheap

diff --git a/lib/libvarnish/binary_heap.c b/lib/libvarnish/binary_heap.c
index 77cd823..322d412 100644
--- a/lib/libvarnish/binary_heap.c
+++ b/lib/libvarnish/binary_heap.c
@@ -223,7 +223,11 @@ binheap_new(void *priv, binheap_cmp_t *cmp_f, binheap_update_t *update_f)
 	bh->cmp = cmp_f;
 	bh->update = update_f;
 	bh->next = ROOT_IDX;
+#ifdef TEST_DRIVER
+	bh->rows = 1;		/* A tiny-ish number */
+#else
 	bh->rows = 16;		/* A tiny-ish number */
+#endif
 	bh->array = calloc(bh->rows, sizeof *bh->array);
 	assert(bh->array != NULL);
 	binheap_addrow(bh);
@@ -472,8 +476,8 @@ struct foo {
 	unsigned	n;
 };
 
-#define M 153557	/* Number of operations */
-#define N 43117		/* Number of items */
+#define M 500083	/* Number of operations */
+#define N 131101	/* Number of items */
 #define R -1		/* Random modulus */
 
 struct foo *ff[N];
@@ -499,6 +503,7 @@ update(void *priv, void *a, unsigned u)
 	fa->idx = u;
 }
 
+#ifdef CHECK2
 static void
 chk2(struct binheap *bh)
 {
@@ -512,6 +517,7 @@ chk2(struct binheap *bh)
 		assert(fa->key >= fb->key);
 	}
 }
+#endif
 
 int
 main(int argc, char **argv)
@@ -523,6 +529,7 @@ main(int argc, char **argv)
 	(void)argc;
 	(void)argv;
 	VRND_SeedAll();
+	VRND_SeedTestable(1);
 	bh = binheap_new(NULL, cmp, update);
 	for (n = 2; n; n += n) {
 		child(bh, n - 1, &u, &v);
@@ -606,8 +613,9 @@ main(int argc, char **argv)
 				CHECK_OBJ_NOTNULL(ff[v], FOO_MAGIC);
 				AN(ff[v]->idx);
 			}
-			if (0)
+#ifdef CHECK2
 				chk2(bh);
+#endif
 		}
 		fprintf(stderr, "%d updates OK\n", M);
 	}

From phk at FreeBSD.org  Sat Nov 18 21:42:07 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Sat, 18 Nov 2017 21:42:07 +0000 (UTC)
Subject: [master] 4177fea VNUM_2bytes doesn't actually work once we get into
 ExaBytes, because it uses a 'double' which only has approx 52 bits of mantissa,
 which is marginal already for PetaBytes.
Message-ID: <20171118214207.96CF192C27@lists.varnish-cache.org>


commit 4177feae6dc57b10e8d4abd7746fa524b9e045e4
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Sat Nov 18 21:39:26 2017 +0000

    VNUM_2bytes doesn't actually work once we get into ExaBytes, because
    it uses a 'double' which only has approx 52 bits of mantissa, which is
    marginal already for PetaBytes.
    
    Test various edge-cases.

diff --git a/lib/libvarnish/vnum.c b/lib/libvarnish/vnum.c
index 5e30fc3..f01aa67 100644
--- a/lib/libvarnish/vnum.c
+++ b/lib/libvarnish/vnum.c
@@ -211,10 +211,6 @@ VNUM_2bytes(const char *p, uintmax_t *r, uintmax_t rel)
 			fval *= (uintmax_t)1 << 50;
 			++end;
 			break;
-		case 'e': case 'E':
-			fval *= (uintmax_t)1 << 60;
-			++end;
-			break;
 		default:
 			break;
 		}
@@ -270,6 +266,11 @@ static struct test_case {
 	{ "1.3TB",		(uintmax_t)0,	(uintmax_t)1429365116109ULL },
 	{ "1.7TB",		(uintmax_t)0,	(uintmax_t)1869169767219ULL },
 
+	{ "1125899906842624",	(uintmax_t)0,	(uintmax_t)1125899906842624ULL},
+	{ "1P",			(uintmax_t)0,	(uintmax_t)1125899906842624ULL},
+	{ "1PB",		(uintmax_t)0,	(uintmax_t)1125899906842624ULL},
+	{ "1.3 PB",		(uintmax_t)0,	(uintmax_t)1463669878895411ULL},
+
 	{ "1%",			(uintmax_t)1024,	(uintmax_t)10 },
 	{ "2%",			(uintmax_t)1024,	(uintmax_t)20 },
 	{ "3%",			(uintmax_t)1024,	(uintmax_t)31 },
@@ -355,6 +356,15 @@ main(int argc, char *argv[])
 			++ec;
 		}
 	}
+	if (!isnan(VNUM_duration(NULL))) {
+		printf("%s: VNUM_Duration(NULL) fail\n", *argv);
+		++ec;
+	}
+	d1 = VNUM_duration(" 365.24219d ");
+	if (d1 != 31556925.216) {
+		printf("%s: VNUM_Duration() wrong: %g\n", *argv, d1);
+		++ec;
+	}
 	/* TODO: test invalid strings */
 	if (!ec)
 		printf("OK\n");

From phk at FreeBSD.org  Sat Nov 18 22:00:07 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Sat, 18 Nov 2017 22:00:07 +0000 (UTC)
Subject: [master] db40993 Try to make space for bad floating-point round-off
 in test.
Message-ID: <20171118220007.DDDEE921ED@lists.varnish-cache.org>


commit db409931e991b5a822456b045ca1fafb36a98cca
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Sat Nov 18 21:59:17 2017 +0000

    Try to make space for bad floating-point round-off in test.

diff --git a/lib/libvarnish/vnum.c b/lib/libvarnish/vnum.c
index f01aa67..c5e03cf 100644
--- a/lib/libvarnish/vnum.c
+++ b/lib/libvarnish/vnum.c
@@ -361,7 +361,7 @@ main(int argc, char *argv[])
 		++ec;
 	}
 	d1 = VNUM_duration(" 365.24219d ");
-	if (d1 != 31556925.216) {
+	if (d1 < 31556925.2159 || d1 > 31556925.216) {
 		printf("%s: VNUM_Duration() wrong: %g\n", *argv, d1);
 		++ec;
 	}

From phk at FreeBSD.org  Sat Nov 18 22:07:05 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Sat, 18 Nov 2017 22:07:05 +0000 (UTC)
Subject: [master] f00e40c Make space for rounding both directions.
Message-ID: <20171118220705.B589E9254D@lists.varnish-cache.org>


commit f00e40c1578bc850653d05f011a890766818046a
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Sat Nov 18 22:05:43 2017 +0000

    Make space for rounding both directions.

diff --git a/lib/libvarnish/vnum.c b/lib/libvarnish/vnum.c
index c5e03cf..14ba022 100644
--- a/lib/libvarnish/vnum.c
+++ b/lib/libvarnish/vnum.c
@@ -361,7 +361,7 @@ main(int argc, char *argv[])
 		++ec;
 	}
 	d1 = VNUM_duration(" 365.24219d ");
-	if (d1 < 31556925.2159 || d1 > 31556925.216) {
+	if (d1 < 31556925.2159 || d1 > 31556925.2161) {
 		printf("%s: VNUM_Duration() wrong: %g\n", *argv, d1);
 		++ec;
 	}

From phk at FreeBSD.org  Sun Nov 19 08:51:08 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Sun, 19 Nov 2017 08:51:08 +0000 (UTC)
Subject: [master] 0df786e Simplify the Telnet/Cli code
Message-ID: <20171119085108.5923192416@lists.varnish-cache.org>


commit 0df786e8a71bc3f7b155ba7d44a789b7e8c498b9
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Sun Nov 19 08:50:12 2017 +0000

    Simplify the Telnet/Cli code

diff --git a/bin/varnishd/mgt/mgt_cli.c b/bin/varnishd/mgt/mgt_cli.c
index 37fe5ed..973cada 100644
--- a/bin/varnishd/mgt/mgt_cli.c
+++ b/bin/varnishd/mgt/mgt_cli.c
@@ -453,41 +453,12 @@ sock_id(const char *pfx, int fd)
 
 /*--------------------------------------------------------------------*/
 
-struct telnet {
-	unsigned		magic;
-#define TELNET_MAGIC		0x53ec3ac0
-	int			fd;
-	struct vev		*ev;
-};
-
-static void
-telnet_close(void *priv)
-{
-	struct telnet *tn;
-
-	CAST_OBJ_NOTNULL(tn, priv, TELNET_MAGIC);
-	(void)close(tn->fd);
-	FREE_OBJ(tn);
-}
-
-static struct telnet *
-telnet_new(int fd)
-{
-	struct telnet *tn;
-
-	ALLOC_OBJ(tn, TELNET_MAGIC);
-	AN(tn);
-	tn->fd = fd;
-	return (tn);
-}
-
 static int
 telnet_accept(const struct vev *ev, int what)
 {
 	struct vsb *vsb;
 	struct sockaddr_storage addr;
 	socklen_t addrlen;
-	struct telnet *tn;
 	int i;
 
 	(void)what;
@@ -499,9 +470,8 @@ telnet_accept(const struct vev *ev, int what)
 		return (0);
 
 	MCH_TrackHighFd(i);
-	tn = telnet_new(i);
 	vsb = sock_id("telnet", i);
-	mgt_cli_setup(i, i, 0, VSB_data(vsb), telnet_close, tn);
+	mgt_cli_setup(i, i, 0, VSB_data(vsb), NULL, NULL);
 	VSB_destroy(&vsb);
 	return (0);
 }
@@ -544,7 +514,7 @@ mct_callback(void *priv, const struct suckaddr *sa)
 	const char *err;
 	char abuf[VTCP_ADDRBUFSIZE];
 	char pbuf[VTCP_PORTBUFSIZE];
-	struct telnet *tn;
+	struct vev *ev;
 
 	VJ_master(JAIL_MASTER_PRIVPORT);
 	sock = VTCP_listen(sa, 10, &err);
@@ -553,14 +523,12 @@ mct_callback(void *priv, const struct suckaddr *sa)
 	if (sock > 0) {
 		VTCP_myname(sock, abuf, sizeof abuf, pbuf, sizeof pbuf);
 		VSB_printf(vsb, "%s %s\n", abuf, pbuf);
-		tn = telnet_new(sock);
-		tn->ev = VEV_Alloc();
-		AN(tn->ev);
-		tn->ev->fd = sock;
-		tn->ev->fd_flags = POLLIN;
-		tn->ev->callback = telnet_accept;
-		tn->ev->priv = tn;
-		AZ(VEV_Start(mgt_evb, tn->ev));
+		ev = VEV_Alloc();
+		AN(ev);
+		ev->fd = sock;
+		ev->fd_flags = POLLIN;
+		ev->callback = telnet_accept;
+		AZ(VEV_Start(mgt_evb, ev));
 	}
 	return (0);
 }
@@ -577,7 +545,8 @@ mgt_cli_telnet(const char *T_arg)
 	AN(vsb);
 	error = VSS_resolver(T_arg, NULL, mct_callback, vsb, &err);
 	if (err != NULL)
-		ARGV_ERR("Could not resolve -T argument to address\n\t%s\n", err);
+		ARGV_ERR("Could not resolve -T argument to address\n\t%s\n",
+		    err);
 	AZ(error);
 	AZ(VSB_finish(vsb));
 	if (VSB_len(vsb) == 0)

From phk at FreeBSD.org  Sun Nov 19 12:42:07 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Sun, 19 Nov 2017 12:42:07 +0000 (UTC)
Subject: [master] ffcbf13 Santitize the teardown process a little bit.
Message-ID: <20171119124207.EFD4691853@lists.varnish-cache.org>


commit ffcbf1332a003e2449b5cf5861b7af3303faf85a
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Sun Nov 19 12:40:29 2017 +0000

    Santitize the teardown process a little bit.

diff --git a/bin/varnishd/mgt/mgt_cli.c b/bin/varnishd/mgt/mgt_cli.c
index 973cada..c1a371d 100644
--- a/bin/varnishd/mgt/mgt_cli.c
+++ b/bin/varnishd/mgt/mgt_cli.c
@@ -666,7 +666,8 @@ mgt_cli_master(const char *M_arg)
 
 	error = VSS_resolver(M_arg, NULL, marg_cb, NULL, &err);
 	if (err != NULL)
-		ARGV_ERR("Could not resolve -M argument to address\n\t%s\n", err);
+		ARGV_ERR("Could not resolve -M argument to address\n\t%s\n",
+		    err);
 	AZ(error);
 	if (VTAILQ_EMPTY(&m_addr_list))
 		ARGV_ERR("Could not resolve -M argument to address\n");
diff --git a/bin/varnishd/mgt/mgt_main.c b/bin/varnishd/mgt/mgt_main.c
index c4f9d94..5b778b5 100644
--- a/bin/varnishd/mgt/mgt_main.c
+++ b/bin/varnishd/mgt/mgt_main.c
@@ -190,6 +190,7 @@ mgt_stdin_close(void *priv)
 	if (d_flag) {
 		MCH_Stop_Child();
 		mgt_cli_close_all();
+		VEV_Destroy(&mgt_evb);
 		(void)VPF_Remove(pfh1);
 		if (pfh2 != NULL)
 			(void)VPF_Remove(pfh2);
@@ -365,11 +366,11 @@ mgt_sigint(const struct vev *e, int what)
 
 	(void)e;
 	(void)what;
-	MGT_Complain(C_ERR, "Manager got SIGINT");
+	MGT_Complain(C_ERR, "Manager got %s", e->name);
 	(void)fflush(stdout);
 	if (MCH_Running())
 		MCH_Stop_Child();
-	exit(0);
+	return (-42);
 }
 
 /*--------------------------------------------------------------------*/
@@ -882,21 +883,22 @@ main(int argc, char * const *argv)
 	AN(e);
 	e->sig = SIGTERM;
 	e->callback = mgt_sigint;
-	e->name = "mgt_sigterm";
+	e->name = "SIGTERM";
 	AZ(VEV_Start(mgt_evb, e));
 
 	e = VEV_Alloc();
 	AN(e);
 	e->sig = SIGINT;
 	e->callback = mgt_sigint;
-	e->name = "mgt_sigint";
+	e->name = "SIGINT";
 	AZ(VEV_Start(mgt_evb, e));
 
 	o = VEV_Loop(mgt_evb);
-	if (o != 0)
+	if (o != 0 && o != -42)
 		MGT_Complain(C_ERR, "VEV_Loop() = %d", o);
 
 	MGT_Complain(C_INFO, "manager dies");
+	VEV_Destroy(&mgt_evb);
 	(void)VPF_Remove(pfh1);
 	if (pfh2 != NULL)
 		(void)VPF_Remove(pfh2);
diff --git a/include/vev.h b/include/vev.h
index 0c92f4b..edd9014 100644
--- a/include/vev.h
+++ b/include/vev.h
@@ -61,12 +61,12 @@ struct vev {
 };
 
 struct vev_root *VEV_New(void);
-void VEV_Destroy(struct vev_root *evb);
+void VEV_Destroy(struct vev_root **);
 
 struct vev *VEV_Alloc(void);
 
-int VEV_Start(struct vev_root *evb, struct vev *e);
-void VEV_Stop(struct vev_root *evb, struct vev *e);
+int VEV_Start(struct vev_root *, struct vev *);
+void VEV_Stop(struct vev_root *, struct vev *);
 
-int VEV_Once(struct vev_root *evb);
-int VEV_Loop(struct vev_root *evb);
+int VEV_Once(struct vev_root *);
+int VEV_Loop(struct vev_root *);
diff --git a/lib/libvarnish/vev.c b/lib/libvarnish/vev.c
index b8f3078..d04a80f 100644
--- a/lib/libvarnish/vev.c
+++ b/lib/libvarnish/vev.c
@@ -215,8 +215,13 @@ VEV_New(void)
 /*--------------------------------------------------------------------*/
 
 void
-VEV_Destroy(struct vev_root *evb)
+VEV_Destroy(struct vev_root **evbp)
 {
+	struct vev_root *evb;
+
+	AN(evbp);
+	evb = *evbp;
+	*evbp = NULL;
 	CHECK_OBJ_NOTNULL(evb, VEV_BASE_MAGIC);
 	assert(evb->thread == pthread_self());
 	evb->magic = 0;
@@ -369,7 +374,7 @@ vev_sched_timeout(struct vev_root *evb, struct vev *e, double t)
 static int
 vev_sched_signal(struct vev_root *evb)
 {
-	int i, j;
+	int i, j, retval = 1;
 	struct vevsig *es;
 	struct vev *e;
 
@@ -386,8 +391,10 @@ vev_sched_signal(struct vev_root *evb)
 			VEV_Stop(evb, e);
 			free(e);
 		}
+		if (i < 0)
+			retval = i;
 	}
-	return (1);
+	return (retval);
 }
 
 int
@@ -395,7 +402,7 @@ VEV_Once(struct vev_root *evb)
 {
 	double t;
 	struct vev *e;
-	int i, j, k, tmo;
+	int i, j, k, tmo, retval = 1;
 
 	CHECK_OBJ_NOTNULL(evb, VEV_BASE_MAGIC);
 	assert(evb->thread == pthread_self());
@@ -454,8 +461,10 @@ VEV_Once(struct vev_root *evb)
 				VEV_Stop(evb, e);
 				free(e);
 			}
+			if (k < 0)
+				retval = k;
 		}
 	}
 	AZ(i);
-	return (1);
+	return (retval);
 }

From phk at FreeBSD.org  Sun Nov 19 16:30:11 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Sun, 19 Nov 2017 16:30:11 +0000 (UTC)
Subject: [master] b9839ab Make it possible to expect a non-zero varnishd exit
 code
Message-ID: <20171119163011.3DF2D92A8E@lists.varnish-cache.org>


commit b9839abc1605335be2091efdb16bf9a5985159be
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Sun Nov 19 16:01:44 2017 +0000

    Make it possible to expect a non-zero varnishd exit code

diff --git a/bin/varnishtest/vtc_varnish.c b/bin/varnishtest/vtc_varnish.c
index afc346c..569ad7b 100644
--- a/bin/varnishtest/vtc_varnish.c
+++ b/bin/varnishtest/vtc_varnish.c
@@ -70,6 +70,8 @@ struct varnish {
 	pthread_t		tp;
 	pthread_t		tp_vsl;
 
+	int			expect_exit;
+
 	int			cli_fd;
 	int			vcl_nbr;
 	char			*workdir;
@@ -645,7 +647,7 @@ varnish_cleanup(struct varnish *v)
 	/* Pick up the VSL thread */
 	AZ(pthread_join(v->tp_vsl, &p));
 
-	if (WIFEXITED(status) && (WEXITSTATUS(status) == 0))
+	if (WIFEXITED(status) && (WEXITSTATUS(status) == v->expect_exit))
 		return;
 #ifdef WCOREDUMP
 	vtc_fatal(v->vl, "Bad exit code: %04x sig %x exit %x core %x",
@@ -1048,6 +1050,8 @@ varnish_expect(const struct varnish *v, char * const *av)
  *         example::
  *
  *                 varnish v1 -expect SM?.s1.g_space > 1000000
+ * \-expectexit NUMBER
+ *	   Expect varnishd to exit(3) with this value
  *
  * \-vsc PATTERN
  *         Dump VSC counters matching PATTERN.
@@ -1154,6 +1158,11 @@ cmd_varnish(CMD_ARGS)
 			av += 2;
 			continue;
 		}
+		if (!strcmp(*av, "-expectexit")) {
+			v->expect_exit = strtoul(av[1], NULL, 0);
+			av++;
+			continue;
+		}
 		if (!strcmp(*av, "-jail")) {
 			AN(av[1]);
 			AZ(v->pid);

From phk at FreeBSD.org  Sun Nov 19 16:30:11 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Sun, 19 Nov 2017 16:30:11 +0000 (UTC)
Subject: [master] 48a5995 More straigthening out of varnishd teardown path,
 which means that we now actually *do* get the "child panicked" exit
 code.
Message-ID: <20171119163011.5342792A90@lists.varnish-cache.org>


commit 48a59957c1029f16b970bbfc19dafbedb0b5a5fd
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Sun Nov 19 16:27:56 2017 +0000

    More straigthening out of varnishd teardown path, which means
    that we now actually *do* get the "child panicked" exit code.

diff --git a/bin/varnishd/mgt/mgt.h b/bin/varnishd/mgt/mgt.h
index 7949d2a..cde0c11 100644
--- a/bin/varnishd/mgt/mgt.h
+++ b/bin/varnishd/mgt/mgt.h
@@ -78,7 +78,7 @@ void MCH_Cli_Fail(void);
 /* mgt_cli.c */
 extern struct VCLS	*mgt_cls;
 
-typedef void mgt_cli_close_f(void *priv);
+typedef int mgt_cli_close_f(void *priv);
 void mgt_cli_setup(int fdi, int fdo, int auth, const char *ident,
     mgt_cli_close_f *close_func, void *priv);
 int mgt_cli_askchild(unsigned *status, char **resp, const char *fmt, ...)
diff --git a/bin/varnishd/mgt/mgt_cli.c b/bin/varnishd/mgt/mgt_cli.c
index c1a371d..9f0a67d 100644
--- a/bin/varnishd/mgt/mgt_cli.c
+++ b/bin/varnishd/mgt/mgt_cli.c
@@ -572,13 +572,13 @@ static double M_poll = 0.1;
 static VTAILQ_HEAD(,m_addr)	m_addr_list =
     VTAILQ_HEAD_INITIALIZER(m_addr_list);
 
-static void __match_proto__(mgt_cli_close_f)
+static int __match_proto__(mgt_cli_close_f)
 Marg_closer(void *priv)
 {
 
 	(void)priv;
-	(void)close(M_fd);
 	M_fd = -1;
+	return(0);
 }
 
 static int __match_proto__(vev_cb_f)
diff --git a/bin/varnishd/mgt/mgt_main.c b/bin/varnishd/mgt/mgt_main.c
index 5b778b5..b7e8251 100644
--- a/bin/varnishd/mgt/mgt_main.c
+++ b/bin/varnishd/mgt/mgt_main.c
@@ -181,25 +181,12 @@ cli_check(const struct cli *cli)
  * This function is called when the CLI on stdin is closed.
  */
 
-static void __match_proto__(mgt_cli_close_f)
+static int __match_proto__(mgt_cli_close_f)
 mgt_stdin_close(void *priv)
 {
 
 	(void)priv;
-
-	if (d_flag) {
-		MCH_Stop_Child();
-		mgt_cli_close_all();
-		VEV_Destroy(&mgt_evb);
-		(void)VPF_Remove(pfh1);
-		if (pfh2 != NULL)
-			(void)VPF_Remove(pfh2);
-		exit(0);
-	} else {
-		VFIL_null_fd(STDIN_FILENO);
-		VFIL_null_fd(STDOUT_FILENO);
-		VFIL_null_fd(STDERR_FILENO);
-	}
+	return (-42);
 }
 
 /*--------------------------------------------------------------------
@@ -391,12 +378,13 @@ mgt_uptime(const struct vev *e, int what)
 
 /*--------------------------------------------------------------------*/
 
-static void __match_proto__(mgt_cli_close_f)
+static int __match_proto__(mgt_cli_close_f)
 mgt_I_close(void *priv)
 {
 	(void)priv;
 	fprintf(stderr, "END of -I file processing\n");
-	closefd(&I_fd);
+	I_fd = -1;
+	return (0);
 }
 
 /*--------------------------------------------------------------------*/
@@ -897,7 +885,10 @@ main(int argc, char * const *argv)
 	if (o != 0 && o != -42)
 		MGT_Complain(C_ERR, "VEV_Loop() = %d", o);
 
+	MGT_Complain(C_INFO, "manager stopping child");
+	MCH_Stop_Child();
 	MGT_Complain(C_INFO, "manager dies");
+	mgt_cli_close_all();
 	VEV_Destroy(&mgt_evb);
 	(void)VPF_Remove(pfh1);
 	if (pfh2 != NULL)
diff --git a/bin/varnishtest/tests/c00057.vtc b/bin/varnishtest/tests/c00057.vtc
index fc4a571..4b05a8f 100644
--- a/bin/varnishtest/tests/c00057.vtc
+++ b/bin/varnishtest/tests/c00057.vtc
@@ -49,3 +49,5 @@ client c1 {
 	txreq
 	rxresp
 } -run
+
+varnish v1 -expectexit 0x20
diff --git a/bin/varnishtest/tests/p00007.vtc b/bin/varnishtest/tests/p00007.vtc
index b0ce377..ddae80d 100644
--- a/bin/varnishtest/tests/p00007.vtc
+++ b/bin/varnishtest/tests/p00007.vtc
@@ -77,3 +77,5 @@ client c1 {
 	rxresp
 	expect resp.bodylen == 48
 } -run
+
+varnish v1 -expectexit 0x20
diff --git a/bin/varnishtest/tests/t02004.vtc b/bin/varnishtest/tests/t02004.vtc
index 24610d1..cca1faf 100644
--- a/bin/varnishtest/tests/t02004.vtc
+++ b/bin/varnishtest/tests/t02004.vtc
@@ -25,3 +25,5 @@ client c1 {
 } -run
 
 varnish v1 -cliok "panic.clear"
+
+varnish v1 -expectexit 0x20
diff --git a/bin/varnishtest/tests/v00010.vtc b/bin/varnishtest/tests/v00010.vtc
index 51f9e65..b948d01 100644
--- a/bin/varnishtest/tests/v00010.vtc
+++ b/bin/varnishtest/tests/v00010.vtc
@@ -84,3 +84,4 @@ client c1 {
 } -run
 
 varnish v1 -cliok "panic.clear -z"
+varnish v1 -expectexit 0x20
diff --git a/include/vcli_serve.h b/include/vcli_serve.h
index eff8a4b..67a1792 100644
--- a/include/vcli_serve.h
+++ b/include/vcli_serve.h
@@ -88,7 +88,7 @@ void VCLI_JSON_str(struct cli *cli, const char *str);
 void VCLI_JSON_ver(struct cli *cli, unsigned ver, const char * const * av);
 void VCLI_SetResult(struct cli *cli, unsigned r);
 
-typedef void cls_cb_f(void *priv);
+typedef int cls_cb_f(void *priv);
 typedef void cls_cbc_f(const struct cli*);
 struct VCLS *VCLS_New(struct VCLS *);
 void VCLS_SetHooks(struct VCLS *, cls_cbc_f *, cls_cbc_f *);
diff --git a/lib/libvarnish/vcli_serve.c b/lib/libvarnish/vcli_serve.c
index 71c2544..33de8f3 100644
--- a/lib/libvarnish/vcli_serve.c
+++ b/lib/libvarnish/vcli_serve.c
@@ -481,9 +481,10 @@ VCLS_AddFd(struct VCLS *cs, int fdi, int fdo, cls_cb_f *closefunc, void *priv)
 	return (cfd->cli);
 }
 
-static void
+static int
 cls_close_fd(struct VCLS *cs, struct VCLS_fd *cfd)
 {
+	int retval = 0;
 
 	CHECK_OBJ_NOTNULL(cs, VCLS_MAGIC);
 	CHECK_OBJ_NOTNULL(cfd, VCLS_FD_MAGIC);
@@ -491,16 +492,15 @@ cls_close_fd(struct VCLS *cs, struct VCLS_fd *cfd)
 	VTAILQ_REMOVE(&cs->fds, cfd, list);
 	cs->nfd--;
 	VSB_destroy(&cfd->cli->sb);
-	if (cfd->closefunc == NULL) {
-		(void)close(cfd->fdi);
-		if (cfd->fdo != cfd->fdi)
-			(void)close(cfd->fdo);
-	} else {
-		cfd->closefunc(cfd->priv);
-	}
+	if (cfd->closefunc != NULL)
+		retval = cfd->closefunc(cfd->priv);
+	(void)close(cfd->fdi);
+	if (cfd->fdo != cfd->fdi)
+		(void)close(cfd->fdo);
 	if (cfd->cli->ident != NULL)
 		free(cfd->cli->ident);
 	FREE_OBJ(cfd);
+	return (retval);
 }
 
 void
@@ -575,8 +575,11 @@ VCLS_Poll(struct VCLS *cs, const struct cli *cli, int timeout)
 		else
 			k = cls_feed(cfd, buf, buf + i);
 	}
-	if (k)
-		cls_close_fd(cs, cfd);
+	if (k) {
+		i = cls_close_fd(cs, cfd);
+		if (i < 0)
+			k = i;
+	}
 	return (k);
 }
 
@@ -589,7 +592,7 @@ VCLS_Destroy(struct VCLS **csp)
 
 	TAKE_OBJ_NOTNULL(cs, csp, VCLS_MAGIC);
 	VTAILQ_FOREACH_SAFE(cfd, &cs->fds, list, cfd2)
-		cls_close_fd(cs, cfd);
+		(void)cls_close_fd(cs, cfd);
 
 	while (!VTAILQ_EMPTY(&cs->funcs)) {
 		clp = VTAILQ_FIRST(&cs->funcs);

From phk at FreeBSD.org  Sun Nov 19 23:13:05 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Sun, 19 Nov 2017 23:13:05 +0000 (UTC)
Subject: [master] 067787b Comment out unused code
Message-ID: <20171119231305.B84B392E7F@lists.varnish-cache.org>


commit 067787be8bf7dd4cedceb8d5b787ca0a4aafd775
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Sun Nov 19 20:12:05 2017 +0000

    Comment out unused code

diff --git a/lib/libvgz/zutil.c b/lib/libvgz/zutil.c
index a76c6b0..5b21ece 100644
--- a/lib/libvgz/zutil.c
+++ b/lib/libvgz/zutil.c
@@ -23,6 +23,7 @@ z_const char * const z_errmsg[10] = {
     (z_const char *)""
 };
 
+#ifdef NOVGZ
 
 const char * ZEXPORT zlibVersion()
 {
@@ -181,6 +182,8 @@ void ZLIB_INTERNAL zmemzero(dest, len)
 }
 #endif
 
+#endif /* NOVGZ */
+
 #ifndef Z_SOLO
 
 #ifdef SYS16BIT

From daghf at varnish-software.com  Mon Nov 20 10:24:10 2017
From: daghf at varnish-software.com (Dag Haavi Finstad)
Date: Mon, 20 Nov 2017 10:24:10 +0000 (UTC)
Subject: [master] fa04c3d Add a force_fresh parameter to VTP_Get
Message-ID: <20171120102410.29C7363143@lists.varnish-cache.org>


commit fa04c3d44d82c2617c985483d1e449a2312bda15
Author: Dag Haavi Finstad <daghf at varnish-software.com>
Date:   Mon Nov 13 16:28:27 2017 +0100

    Add a force_fresh parameter to VTP_Get
    
    Passing a nonzero value will force a fresh backend connection.

diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c
index 31f77e9..d0fa5bb 100644
--- a/bin/varnishd/cache/cache_backend.c
+++ b/bin/varnishd/cache/cache_backend.c
@@ -112,7 +112,7 @@ vbe_dir_getfd(struct worker *wrk, struct backend *bp, struct busyobj *bo)
 	bo->htc->doclose = SC_NULL;
 
 	FIND_TMO(connect_timeout, tmod, bo, bp);
-	vtp = VTP_Get(bp->tcp_pool, tmod, wrk);
+	vtp = VTP_Get(bp->tcp_pool, tmod, wrk, 0);
 	if (vtp == NULL) {
 		VSLb(bo->vsl, SLT_FetchError,
 		     "backend %s: fail", bp->director->display_name);
diff --git a/bin/varnishd/cache/cache_tcp_pool.c b/bin/varnishd/cache/cache_tcp_pool.c
index 04ea7e2..943cdd1 100644
--- a/bin/varnishd/cache/cache_tcp_pool.c
+++ b/bin/varnishd/cache/cache_tcp_pool.c
@@ -366,7 +366,8 @@ VTP_Close(struct vtp **vtpp)
  */
 
 struct vtp *
-VTP_Get(struct tcp_pool *tp, double tmo, struct worker *wrk)
+VTP_Get(struct tcp_pool *tp, double tmo, struct worker *wrk,
+    unsigned force_fresh)
 {
 	struct vtp *vtp;
 
@@ -376,7 +377,7 @@ VTP_Get(struct tcp_pool *tp, double tmo, struct worker *wrk)
 	Lck_Lock(&tp->mtx);
 	vtp = VTAILQ_FIRST(&tp->connlist);
 	CHECK_OBJ_ORNULL(vtp, VTP_MAGIC);
-	if (vtp == NULL || vtp->state == VTP_STATE_STOLEN)
+	if (force_fresh || vtp == NULL || vtp->state == VTP_STATE_STOLEN)
 		vtp = NULL;
 	else {
 		assert(vtp->tcp_pool == tp);
diff --git a/bin/varnishd/cache/cache_tcp_pool.h b/bin/varnishd/cache/cache_tcp_pool.h
index 11b0f82..4dbc12f 100644
--- a/bin/varnishd/cache/cache_tcp_pool.h
+++ b/bin/varnishd/cache/cache_tcp_pool.h
@@ -85,7 +85,8 @@ void VTP_Recycle(const struct worker *, struct vtp **);
 	 * Recycle an open connection.
 	 */
 
-struct vtp *VTP_Get(struct tcp_pool *, double tmo, struct worker *);
+struct vtp *VTP_Get(struct tcp_pool *, double tmo, struct worker *,
+    unsigned force_fresh);
 	/*
 	 * Get a (possibly) recycled connection.
 	 */

From daghf at varnish-software.com  Mon Nov 20 10:24:10 2017
From: daghf at varnish-software.com (Dag Haavi Finstad)
Date: Mon, 20 Nov 2017 10:24:10 +0000 (UTC)
Subject: [master] fa38843 Limit backend connection retries to a single retry
Message-ID: <20171120102410.443EA6314E@lists.varnish-cache.org>


commit fa3884391f85565cb7d564cfa5f22d066948d7bc
Author: Dag Haavi Finstad <daghf at varnish-software.com>
Date:   Thu Nov 16 13:09:34 2017 +0100

    Limit backend connection retries to a single retry
    
    The second time around, we force a fresh connection.
    
    The VCL user may choose to do 'return (retry);' in vcl_backend_error{}
    if further attempts are deemed warranted.
    
    Fixes: #2135

diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c
index d0fa5bb..c5f9127 100644
--- a/bin/varnishd/cache/cache_backend.c
+++ b/bin/varnishd/cache/cache_backend.c
@@ -74,7 +74,8 @@ static struct lock backends_mtx;
  */
 
 static struct vtp *
-vbe_dir_getfd(struct worker *wrk, struct backend *bp, struct busyobj *bo)
+vbe_dir_getfd(struct worker *wrk, struct backend *bp, struct busyobj *bo,
+    unsigned force_fresh)
 {
 	struct vtp *vtp;
 	double tmod;
@@ -112,7 +113,7 @@ vbe_dir_getfd(struct worker *wrk, struct backend *bp, struct busyobj *bo)
 	bo->htc->doclose = SC_NULL;
 
 	FIND_TMO(connect_timeout, tmod, bo, bp);
-	vtp = VTP_Get(bp->tcp_pool, tmod, wrk, 0);
+	vtp = VTP_Get(bp->tcp_pool, tmod, wrk, force_fresh);
 	if (vtp == NULL) {
 		VSLb(bo->vsl, SLT_FetchError,
 		     "backend %s: fail", bp->director->display_name);
@@ -221,7 +222,7 @@ vbe_dir_gethdrs(const struct director *d, struct worker *wrk,
 		http_PrintfHeader(bo->bereq, "Host: %s", bp->hosthdr);
 
 	do {
-		vtp = vbe_dir_getfd(wrk, bp, bo);
+		vtp = vbe_dir_getfd(wrk, bp, bo, extrachance == 0);
 		if (vtp == NULL)
 			return (-1);
 		AN(bo->htc);
@@ -256,7 +257,7 @@ vbe_dir_gethdrs(const struct director *d, struct worker *wrk,
 		    bo->req->req_body_status != REQ_BODY_CACHED)
 			break;
 		VSC_C_main->backend_retry++;
-	} while (extrachance);
+	} while (extrachance--);
 	return (-1);
 }
 
@@ -299,7 +300,7 @@ vbe_dir_http1pipe(const struct director *d, struct req *req, struct busyobj *bo)
 
 	req->res_mode = RES_PIPE;
 
-	vtp = vbe_dir_getfd(req->wrk, bp, bo);
+	vtp = vbe_dir_getfd(req->wrk, bp, bo, 0);
 
 	if (vtp == NULL) {
 		retval = SC_TX_ERROR;
diff --git a/bin/varnishtest/tests/r02135.vtc b/bin/varnishtest/tests/r02135.vtc
new file mode 100644
index 0000000..3868bd3
--- /dev/null
+++ b/bin/varnishtest/tests/r02135.vtc
@@ -0,0 +1,40 @@
+varnishtest "#2135: fetch retry logic"
+
+barrier b1 cond 2
+
+server s1 {
+	rxreq
+	txresp
+	rxreq
+	expect req.url == "/foo"
+	delay 2.5
+	send " "
+	expect_close
+	accept
+	rxreq
+	expect req.url == "/foo"
+	barrier b1 sync
+	delay 2.5
+	send " "
+	expect_close
+} -start
+
+varnish v1 -cliok "param.set between_bytes_timeout 1"
+varnish v1 -cliok "param.set first_byte_timeout 1"
+
+varnish v1 -vcl+backend {
+	sub vcl_backend_error {
+		set beresp.http.url = bereq.url;
+	}
+} -start
+
+client c1 {
+	txreq
+	rxresp
+	expect resp.status == "200"
+	txreq -url "/foo"
+	barrier b1 sync
+	rxresp
+	expect resp.status == "503"
+	expect resp.http.url == "/foo"
+} -run

From nils.goroll at uplex.de  Mon Nov 20 18:33:09 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Mon, 20 Nov 2017 18:33:09 +0000 (UTC)
Subject: [master] 4b48f88 vcc: return no symbol when types don't match
Message-ID: <20171120183309.135D892D50@lists.varnish-cache.org>


commit 4b48f886a5d9937fbd5b56a1560c755d6e42669f
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Mon Nov 20 19:25:36 2017 +0100

    vcc: return no symbol when types don't match
    
    When we are looking for ! SYM_NONE and find ! SYM_NONE, do not
    return the symbol we found.
    
    The semantics of (kind != SYM_NONE && sym->kind != kind) are
    inclusive because the next conditional is not true for this case.
    
    Ref: 9d81a71a1987f07021ae9f653b0f8f4c54544dbe
    
    Fixes: #2497

diff --git a/bin/varnishtest/tests/v00016.vtc b/bin/varnishtest/tests/v00016.vtc
index dd81a8c..798beae 100644
--- a/bin/varnishtest/tests/v00016.vtc
+++ b/bin/varnishtest/tests/v00016.vtc
@@ -88,3 +88,17 @@ varnish v1 -errvcl {resolves to too many addresses} {
 		if (remote.ip == "varnish-cache.org") {}
 	}
 }
+
+varnish v1 -errvcl {Undefined acl foo} {
+	import directors;
+	backend b { .host = "127.0.0.1"; }
+
+	sub vcl_init {
+		new foo = directors.shard();
+	}
+	sub vcl_recv {
+		if (client.ip ~ foo) {
+			return (synth(200));
+		}
+	}
+}
diff --git a/lib/libvcc/vcc_symb.c b/lib/libvcc/vcc_symb.c
index 2ee26b4..83ec097 100644
--- a/lib/libvcc/vcc_symb.c
+++ b/lib/libvcc/vcc_symb.c
@@ -146,8 +146,9 @@ VCC_Symbol(struct vcc *tl, struct symbol *parent,
 			continue;
 		if (q < e)
 			break;
-		if (kind != SYM_NONE && sym->kind != kind)
-			break;
+		if (kind != SYM_NONE && sym->kind != SYM_NONE &&
+		    kind != sym->kind)
+			sym = NULL;
 		if (kind == SYM_NONE && sym->kind == kind)
 			continue;
 		break;

From phk at FreeBSD.org  Mon Nov 20 21:25:09 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Mon, 20 Nov 2017 21:25:09 +0000 (UTC)
Subject: [master] 0c7067a Don't assign NULL to the iterator variable.
Message-ID: <20171120212509.78D9A9245A@lists.varnish-cache.org>


commit 0c7067a8f6e6e7922ab72a29cfe63f3d10c59152
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Nov 20 21:23:37 2017 +0000

    Don't assign NULL to the iterator variable.

diff --git a/lib/libvcc/vcc_symb.c b/lib/libvcc/vcc_symb.c
index 83ec097..8342a89 100644
--- a/lib/libvcc/vcc_symb.c
+++ b/lib/libvcc/vcc_symb.c
@@ -148,7 +148,7 @@ VCC_Symbol(struct vcc *tl, struct symbol *parent,
 			break;
 		if (kind != SYM_NONE && sym->kind != SYM_NONE &&
 		    kind != sym->kind)
-			sym = NULL;
+			continue;
 		if (kind == SYM_NONE && sym->kind == kind)
 			continue;
 		break;

From nils.goroll at uplex.de  Mon Nov 20 22:57:07 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Mon, 20 Nov 2017 22:57:07 +0000 (UTC)
Subject: [master] 9170b2e vcc: Fix null pointer dereference if symbol lacks
 constructor information
Message-ID: <20171120225707.6D749922F5@lists.varnish-cache.org>


commit 9170b2e81332eec34f2bb071b39a8976fefda7f6
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Mon Nov 20 23:12:54 2017 +0100

    vcc: Fix null pointer dereference if symbol lacks constructor information
    
    This issue is hidden by the fix in the previous commits, so we cannot test
    for it directly any more. Applying this patch to
    fa3884391f85565cb7d564cfa5f22d066948d7bc exposes the "Constructor not found".
    
    Fixes #2498

diff --git a/bin/varnishtest/tests/v00016.vtc b/bin/varnishtest/tests/v00016.vtc
index 798beae..0f9a4c8 100644
--- a/bin/varnishtest/tests/v00016.vtc
+++ b/bin/varnishtest/tests/v00016.vtc
@@ -102,3 +102,14 @@ varnish v1 -errvcl {Undefined acl foo} {
 		}
 	}
 }
+
+varnish v1 -errvcl {Symbol not found: 'foo'} {
+	backend b { .host = "127.0.0.1"; }
+
+	acl foo {
+	    "127.0.0.1"/32;
+	}
+	sub vcl_init {
+		new bar = foo;
+	}
+}
diff --git a/lib/libvcc/vcc_vmod.c b/lib/libvcc/vcc_vmod.c
index 92d63fd..7553b16 100644
--- a/lib/libvcc/vcc_vmod.c
+++ b/lib/libvcc/vcc_vmod.c
@@ -291,8 +291,12 @@ vcc_ParseNew(struct vcc *tl)
 
 	ExpectErr(tl, ID);
 	sy2 = VCC_SymbolTok(tl, NULL, tl->t, SYM_OBJECT, 0);
-	if (sy2 == NULL) {
-		VSB_printf(tl->sb, "Symbol not found: ");
+	if (sy2 == NULL || sy2->extra == NULL) {
+		if (sy2 == NULL)
+			p = "Symbol";
+		else if (sy2->extra == NULL)
+			p = "Constructor";
+		VSB_printf(tl->sb, "%s not found: ", p);
 		vcc_ErrToken(tl, tl->t);
 		VSB_printf(tl->sb, " at ");
 		vcc_ErrWhere(tl, tl->t);
@@ -301,6 +305,7 @@ vcc_ParseNew(struct vcc *tl)
 	vcc_NextToken(tl);
 
 	p = sy2->extra;
+	AN(p);
 
 	s_obj = p;
 	p += strlen(p) + 1;

From nils.goroll at uplex.de  Tue Nov 21 11:45:11 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Tue, 21 Nov 2017 11:45:11 +0000 (UTC)
Subject: [master] 23b6977 make flexelint happybg
Message-ID: <20171121114511.507EB92DCB@lists.varnish-cache.org>


commit 23b697771358fe77e2ab0b6b0b4d6f8ec38a8b48
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Tue Nov 21 12:44:27 2017 +0100

    make flexelint happybg

diff --git a/lib/libvcc/vcc_vmod.c b/lib/libvcc/vcc_vmod.c
index 7553b16..e6d6e64 100644
--- a/lib/libvcc/vcc_vmod.c
+++ b/lib/libvcc/vcc_vmod.c
@@ -294,7 +294,7 @@ vcc_ParseNew(struct vcc *tl)
 	if (sy2 == NULL || sy2->extra == NULL) {
 		if (sy2 == NULL)
 			p = "Symbol";
-		else if (sy2->extra == NULL)
+		else
 			p = "Constructor";
 		VSB_printf(tl->sb, "%s not found: ", p);
 		vcc_ErrToken(tl, tl->t);

From daghf at varnish-software.com  Thu Nov 23 15:11:04 2017
From: daghf at varnish-software.com (Dag Haavi Finstad)
Date: Thu, 23 Nov 2017 15:11:04 +0000 (UTC)
Subject: [master] d60893d r02135.vtc test case fixes
Message-ID: <20171123151104.BF76992696@lists.varnish-cache.org>


commit d60893d3817ff8a63fba1d370396738165b3451d
Author: Dag Haavi Finstad <daghf at varnish-software.com>
Date:   Thu Nov 23 16:08:40 2017 +0100

    r02135.vtc test case fixes
    
    This test case should not rely on
    first_byte_timeout/between_bytes_timeout.

diff --git a/bin/varnishtest/tests/r02135.vtc b/bin/varnishtest/tests/r02135.vtc
index 3868bd3..7f9182f 100644
--- a/bin/varnishtest/tests/r02135.vtc
+++ b/bin/varnishtest/tests/r02135.vtc
@@ -7,21 +7,15 @@ server s1 {
 	txresp
 	rxreq
 	expect req.url == "/foo"
-	delay 2.5
-	send " "
-	expect_close
+	close
 	accept
 	rxreq
 	expect req.url == "/foo"
 	barrier b1 sync
-	delay 2.5
-	send " "
+	close
 	expect_close
 } -start
 
-varnish v1 -cliok "param.set between_bytes_timeout 1"
-varnish v1 -cliok "param.set first_byte_timeout 1"
-
 varnish v1 -vcl+backend {
 	sub vcl_backend_error {
 		set beresp.http.url = bereq.url;

From phk at FreeBSD.org  Sat Nov 25 00:13:06 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Sat, 25 Nov 2017 00:13:06 +0000 (UTC)
Subject: [master] 796398a Use umask 0 while doing gcov,
 so the jail tests can store their counts.
Message-ID: <20171125001306.DAE8D9388A@lists.varnish-cache.org>


commit 796398a718a6d4c9ef7b1eea1d3dec4ec5924dee
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Sat Nov 25 00:11:29 2017 +0000

    Use umask 0 while doing gcov, so the jail tests can store their counts.

diff --git a/tools/vtest.sh b/tools/vtest.sh
index e990d10..b2e121d 100755
--- a/tools/vtest.sh
+++ b/tools/vtest.sh
@@ -151,6 +151,7 @@ makegcov () (
 
 	export CFLAGS="-fprofile-arcs -ftest-coverage -fstack-protector -DDONT_DLCLOSE_VMODS" CC=gcc49
 	export MAKEFLAGS=-j1
+	umask 0
 
 	find . -name '*.gc??' -print | xargs rm -f
 

From daghf at varnish-software.com  Mon Nov 27 11:51:07 2017
From: daghf at varnish-software.com (Dag Haavi Finstad)
Date: Mon, 27 Nov 2017 11:51:07 +0000 (UTC)
Subject: [master] 7117943 Make VTP_Close capable of dealing with STOLEN vtps
Message-ID: <20171127115107.8BCCD93732@lists.varnish-cache.org>


commit 71179430033d32f6844b56f2f78db8c94492154c
Author: Dag Haavi Finstad <daghf at varnish-software.com>
Date:   Thu Nov 23 13:47:44 2017 +0100

    Make VTP_Close capable of dealing with STOLEN vtps
    
    The change from shutdown(.., SHUT_WR) to shutdown(.., SHUT_RDWR) is
    required to make it trigger a waiter event.

diff --git a/bin/varnishd/cache/cache_tcp_pool.c b/bin/varnishd/cache/cache_tcp_pool.c
index 943cdd1..855eb0c 100644
--- a/bin/varnishd/cache/cache_tcp_pool.c
+++ b/bin/varnishd/cache/cache_tcp_pool.c
@@ -342,13 +342,14 @@ VTP_Close(struct vtp **vtpp)
 	tp = vtp->tcp_pool;
 	CHECK_OBJ_NOTNULL(tp, TCP_POOL_MAGIC);
 
-	assert(vtp->state == VTP_STATE_USED);
 	assert(vtp->fd > 0);
 
 	Lck_Lock(&tp->mtx);
+	assert(vtp->state == VTP_STATE_USED || vtp->state == VTP_STATE_STOLEN);
 	tp->n_used--;
 	if (vtp->state == VTP_STATE_STOLEN) {
-		(void)shutdown(vtp->fd, SHUT_WR);
+		(void)shutdown(vtp->fd, SHUT_RDWR);
+		VTAILQ_REMOVE(&tp->connlist, vtp, list);
 		vtp->state = VTP_STATE_CLEANUP;
 		VTAILQ_INSERT_HEAD(&tp->killlist, vtp, list);
 		tp->n_kill++;

From daghf at varnish-software.com  Mon Nov 27 11:51:07 2017
From: daghf at varnish-software.com (Dag Haavi Finstad)
Date: Mon, 27 Nov 2017 11:51:07 +0000 (UTC)
Subject: [master] 5e06e03 Drop VTP_Wait call in vbe_dir_finish
Message-ID: <20171127115107.A518193735@lists.varnish-cache.org>


commit 5e06e03bcf50026fad4d7ee8ae4efd6076e22e7a
Author: Dag Haavi Finstad <daghf at varnish-software.com>
Date:   Fri Nov 24 16:13:08 2017 +0100

    Drop VTP_Wait call in vbe_dir_finish
    
    With VTP_Close now being capable of dealing with STOLEN connections, we
    no longer need to VTP_Wait for them prior to close.

diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c
index c5f9127..5f5ebb5 100644
--- a/bin/varnishd/cache/cache_backend.c
+++ b/bin/varnishd/cache/cache_backend.c
@@ -178,13 +178,15 @@ vbe_dir_finish(const struct director *d, struct worker *wrk,
 	CAST_OBJ_NOTNULL(vtp, bo->htc->priv, VTP_MAGIC);
 	bo->htc->priv = NULL;
 	if (vtp->state != VTP_STATE_USED)
-		VTP_Wait(wrk, vtp);
+		assert(bo->htc->doclose == SC_TX_PIPE);
 	if (bo->htc->doclose != SC_NULL || bp->proxy_header != 0) {
 		VSLb(bo->vsl, SLT_BackendClose, "%d %s", vtp->fd,
 		    bp->director->display_name);
 		VTP_Close(&vtp);
+		AZ(vtp);
 		Lck_Lock(&bp->mtx);
 	} else {
+		assert (vtp->state == VTP_STATE_USED);
 		VSLb(bo->vsl, SLT_BackendReuse, "%d %s", vtp->fd,
 		    bp->director->display_name);
 		Lck_Lock(&bp->mtx);

From daghf at varnish-software.com  Mon Nov 27 11:51:07 2017
From: daghf at varnish-software.com (Dag Haavi Finstad)
Date: Mon, 27 Nov 2017 11:51:07 +0000 (UTC)
Subject: [master] eecd409 Honor first_byte_timeout for recycled backend
 connections
Message-ID: <20171127115107.CA11993741@lists.varnish-cache.org>


commit eecd409d13f145765de3aeee4984179e0ae008b5
Author: Dag Haavi Finstad <daghf at varnish-software.com>
Date:   Fri Nov 24 16:22:55 2017 +0100

    Honor first_byte_timeout for recycled backend connections
    
    Fixes: #1772

diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c
index 5f5ebb5..48075d9 100644
--- a/bin/varnishd/cache/cache_backend.c
+++ b/bin/varnishd/cache/cache_backend.c
@@ -178,7 +178,8 @@ vbe_dir_finish(const struct director *d, struct worker *wrk,
 	CAST_OBJ_NOTNULL(vtp, bo->htc->priv, VTP_MAGIC);
 	bo->htc->priv = NULL;
 	if (vtp->state != VTP_STATE_USED)
-		assert(bo->htc->doclose == SC_TX_PIPE);
+		assert(bo->htc->doclose == SC_TX_PIPE ||
+			bo->htc->doclose == SC_RX_TIMEOUT);
 	if (bo->htc->doclose != SC_NULL || bp->proxy_header != 0) {
 		VSLb(bo->vsl, SLT_BackendClose, "%d %s", vtp->fd,
 		    bp->director->display_name);
@@ -233,16 +234,24 @@ vbe_dir_gethdrs(const struct director *d, struct worker *wrk,
 
 		i = V1F_SendReq(wrk, bo, &bo->acct.bereq_hdrbytes, 0);
 
-		if (vtp->state != VTP_STATE_USED)
-			VTP_Wait(wrk, vtp);
-
-		assert(vtp->state == VTP_STATE_USED);
+		if (vtp->state != VTP_STATE_USED) {
+			if (VTP_Wait(wrk, vtp, VTIM_real() +
+			    bo->htc->first_byte_timeout) != 0) {
+				bo->htc->doclose = SC_RX_TIMEOUT;
+				VSLb(bo->vsl, SLT_FetchError,
+				     "Timed out reusing backend connection");
+				extrachance = 0;
+			}
+		}
 
-		if (i == 0)
-			i = V1F_FetchRespHdr(bo);
-		if (i == 0) {
-			AN(bo->htc->priv);
-			return (0);
+		if (bo->htc->doclose == SC_NULL) {
+			assert(vtp->state == VTP_STATE_USED);
+			if (i == 0)
+				i = V1F_FetchRespHdr(bo);
+			if (i == 0) {
+				AN(bo->htc->priv);
+				return (0);
+			}
 		}
 
 		/*
@@ -252,7 +261,7 @@ vbe_dir_gethdrs(const struct director *d, struct worker *wrk,
 		 */
 		vbe_dir_finish(d, wrk, bo);
 		AZ(bo->htc);
-		if (i < 0)
+		if (i < 0 || extrachance == 0)
 			break;
 		if (bo->req != NULL &&
 		    bo->req->req_body_status != REQ_BODY_NONE &&
diff --git a/bin/varnishd/cache/cache_tcp_pool.c b/bin/varnishd/cache/cache_tcp_pool.c
index 855eb0c..18adad3 100644
--- a/bin/varnishd/cache/cache_tcp_pool.c
+++ b/bin/varnishd/cache/cache_tcp_pool.c
@@ -31,6 +31,7 @@
 
 #include "config.h"
 
+#include <errno.h>
 #include <stdlib.h>
 
 #include "cache_varnishd.h"
@@ -416,10 +417,11 @@ VTP_Get(struct tcp_pool *tp, double tmo, struct worker *wrk,
 /*--------------------------------------------------------------------
  */
 
-void
-VTP_Wait(struct worker *wrk, struct vtp *vtp)
+int
+VTP_Wait(struct worker *wrk, struct vtp *vtp, double tmo)
 {
 	struct tcp_pool *tp;
+	int r;
 
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
 	CHECK_OBJ_NOTNULL(vtp, VTP_MAGIC);
@@ -427,11 +429,21 @@ VTP_Wait(struct worker *wrk, struct vtp *vtp)
 	CHECK_OBJ_NOTNULL(tp, TCP_POOL_MAGIC);
 	assert(vtp->cond == &wrk->cond);
 	Lck_Lock(&tp->mtx);
-	while (vtp->state == VTP_STATE_STOLEN)
-		AZ(Lck_CondWait(&wrk->cond, &tp->mtx, 0));
+	while (vtp->state == VTP_STATE_STOLEN) {
+		r = Lck_CondWait(&wrk->cond, &tp->mtx, tmo);
+		if (r != 0) {
+			if (r == EINTR)
+				continue;
+			assert(r == ETIMEDOUT);
+			Lck_Unlock(&tp->mtx);
+			return (1);
+		}
+	}
 	assert(vtp->state == VTP_STATE_USED);
 	vtp->cond = NULL;
 	Lck_Unlock(&tp->mtx);
+
+	return (0);
 }
 
 /*--------------------------------------------------------------------*/
diff --git a/bin/varnishd/cache/cache_tcp_pool.h b/bin/varnishd/cache/cache_tcp_pool.h
index 4dbc12f..d9d3c54 100644
--- a/bin/varnishd/cache/cache_tcp_pool.h
+++ b/bin/varnishd/cache/cache_tcp_pool.h
@@ -91,7 +91,7 @@ struct vtp *VTP_Get(struct tcp_pool *, double tmo, struct worker *,
 	 * Get a (possibly) recycled connection.
 	 */
 
-void VTP_Wait(struct worker *, struct vtp *);
+int VTP_Wait(struct worker *, struct vtp *, double tmo);
 	/*
 	 * If the connection was recycled (state != VTP_STATE_USED) call this
 	 * function before attempting to receive on the connection.
diff --git a/bin/varnishtest/tests/r01772.vtc b/bin/varnishtest/tests/r01772.vtc
new file mode 100644
index 0000000..93c5e1b
--- /dev/null
+++ b/bin/varnishtest/tests/r01772.vtc
@@ -0,0 +1,24 @@
+varnishtest "#1772: Honor first_byte_timeout on a recycled connection"
+
+server s1 {
+	rxreq
+	expect req.url == "/first"
+	txresp
+
+	rxreq
+	expect req.url == "/second"
+	delay 2
+	txresp
+} -start
+
+varnish v1 -arg "-p first_byte_timeout=1" -vcl+backend {} -start
+
+client c1 {
+	txreq -url "/first"
+	rxresp
+	expect resp.status == 200
+
+	txreq -url "/second"
+	rxresp
+	expect resp.status == 503
+} -run

From martin at varnish-software.com  Mon Nov 27 12:00:10 2017
From: martin at varnish-software.com (Martin Blix Grydeland)
Date: Mon, 27 Nov 2017 12:00:10 +0000 (UTC)
Subject: [master] cf6c5c6 Deref the objcore before switching to synth on error.
Message-ID: <20171127120010.E748793DBD@lists.varnish-cache.org>


commit cf6c5c656666fbf2c9611eb88ff6150157d4e138
Author: Martin Blix Grydeland <martin at varnish-software.com>
Date:   Fri Nov 24 13:54:01 2017 +0100

    Deref the objcore before switching to synth on error.
    
    Also add asserts for the references held in req->objcore and
    req->stale_oc.
    
    The test case for #1807 catches this bug after adding the asserts.
    
    Fixes: #2502

diff --git a/bin/varnishd/cache/cache_req_fsm.c b/bin/varnishd/cache/cache_req_fsm.c
index 8e9b019..f52f8f6 100644
--- a/bin/varnishd/cache/cache_req_fsm.c
+++ b/bin/varnishd/cache/cache_req_fsm.c
@@ -114,6 +114,7 @@ cnt_deliver(struct worker *wrk, struct req *req)
 	CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
 	CHECK_OBJ_NOTNULL(req->objcore, OBJCORE_MAGIC);
 	CHECK_OBJ_NOTNULL(req->objcore->objhead, OBJHEAD_MAGIC);
+	AZ(req->stale_oc);
 	AN(req->vcl);
 
 	assert(req->objcore->refcnt > 0);
@@ -123,6 +124,7 @@ cnt_deliver(struct worker *wrk, struct req *req)
 	HTTP_Setup(req->resp, req->ws, req->vsl, SLT_RespMethod);
 	if (HTTP_Decode(req->resp,
 	    ObjGetAttr(req->wrk, req->objcore, OA_HEADERS, NULL))) {
+		(void)HSH_DerefObjCore(wrk, &req->objcore, HSH_RUSH_POLICY);
 		req->err_code = 500;
 		req->req_step = R_STP_SYNTH;
 		return (REQ_FSM_MORE);
@@ -203,6 +205,9 @@ cnt_vclfail(const struct worker *wrk, struct req *req)
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
 	CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
 
+	AZ(req->objcore);
+	AZ(req->stale_oc);
+
 	HTTP_Copy(req->http, req->http0);
 	WS_Reset(req->ws, req->ws_req);
 	req->err_code = 503;
@@ -228,6 +233,9 @@ cnt_synth(struct worker *wrk, struct req *req)
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
 	CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
 
+	AZ(req->objcore);
+	AZ(req->stale_oc);
+
 	wrk->stats->s_synth++;
 
 	now = W_TIM_real(wrk);
@@ -339,6 +347,8 @@ cnt_transmit(struct worker *wrk, struct req *req)
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
 	CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
 	CHECK_OBJ_NOTNULL(req->transport, TRANSPORT_MAGIC);
+	CHECK_OBJ_NOTNULL(req->objcore, OBJCORE_MAGIC);
+	AZ(req->stale_oc);
 
 	/* Grab a ref to the bo if there is one */
 	boc = HSH_RefBoc(req->objcore);
@@ -426,6 +436,7 @@ cnt_fetch(struct worker *wrk, struct req *req)
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
 	CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
 	CHECK_OBJ_NOTNULL(req->objcore, OBJCORE_MAGIC);
+	AZ(req->stale_oc);
 
 	wrk->stats->s_fetch++;
 	(void)VRB_Ignore(req);
@@ -457,6 +468,7 @@ cnt_lookup(struct worker *wrk, struct req *req)
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
 	CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
 	AZ(req->objcore);
+	AZ(req->stale_oc);
 
 	AN(req->vcl);
 
@@ -586,6 +598,7 @@ cnt_miss(struct worker *wrk, struct req *req)
 	CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
 	AN(req->vcl);
 	CHECK_OBJ_NOTNULL(req->objcore, OBJCORE_MAGIC);
+	CHECK_OBJ_ORNULL(req->stale_oc, OBJCORE_MAGIC);
 
 	VCL_miss_method(req->vcl, wrk, req, NULL, NULL);
 	switch (wrk->handling) {
@@ -630,6 +643,7 @@ cnt_pass(struct worker *wrk, struct req *req)
 	CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
 	AN(req->vcl);
 	AZ(req->objcore);
+	AZ(req->stale_oc);
 
 	VCL_pass_method(req->vcl, wrk, req, NULL, NULL);
 	switch (wrk->handling) {
@@ -667,6 +681,8 @@ cnt_pipe(struct worker *wrk, struct req *req)
 
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
 	CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
+	AZ(req->objcore);
+	AZ(req->stale_oc);
 	AN(req->vcl);
 
 	wrk->stats->s_pipe++;
@@ -723,6 +739,8 @@ cnt_restart(struct worker *wrk, struct req *req)
 
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
 	CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
+	AZ(req->objcore);
+	AZ(req->stale_oc);
 
 	if (++req->restarts > cache_param->max_restarts) {
 		VSLb(req->vsl, SLT_VCL_Error, "Too many restarts");
@@ -801,6 +819,7 @@ cnt_recv(struct worker *wrk, struct req *req)
 	CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
 	AN(req->vcl);
 	AZ(req->objcore);
+	AZ(req->stale_oc);
 	AZ(req->err_code);
 
 	AZ(isnan(req->t_first));
@@ -922,6 +941,7 @@ cnt_purge(struct worker *wrk, struct req *req)
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
 	CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
 	AZ(req->objcore);
+	AZ(req->stale_oc);
 
 	AN(req->vcl);
 

From phk at FreeBSD.org  Mon Nov 27 12:30:13 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Mon, 27 Nov 2017 12:30:13 +0000 (UTC)
Subject: [master] c81eced Dont tell worker "0auto" if we mean "0cold"
Message-ID: <20171127123013.1002293955@lists.varnish-cache.org>


commit c81eced9eaa83754c87027b88295ee9cc685f25e
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Nov 27 11:51:00 2017 +0000

    Dont tell worker "0auto" if we mean "0cold"

diff --git a/bin/varnishd/mgt/mgt_vcl.c b/bin/varnishd/mgt/mgt_vcl.c
index d2428b3..224082b 100644
--- a/bin/varnishd/mgt/mgt_vcl.c
+++ b/bin/varnishd/mgt/mgt_vcl.c
@@ -430,7 +430,7 @@ mgt_vcl_setstate(struct cli *cli, struct vclprog *vp, const char *vs)
 	}
 
 	i = mgt_cli_askchild(&status, &p, "vcl.state %s %d%s\n",
-	    vp->name, warm, vp->state);
+	    vp->name, warm, vs);
 	if (i && cli != NULL) {
 		VCLI_SetResult(cli, status);
 		VCLI_Out(cli, "%s", p);
@@ -750,6 +750,7 @@ mcf_vcl_discard(struct cli *cli, const char * const *av, void *priv)
 		(void)mgt_vcl_setstate(cli, vp, VCL_STATE_COLD);
 	if (MCH_Running()) {
 		/* XXX If this fails the child is crashing, figure that later */
+		assert(!vp->warm);
 		(void)mgt_cli_askchild(&status, &p, "vcl.discard %s\n", av[2]);
 		free(p);
 	}

From phk at FreeBSD.org  Mon Nov 27 12:30:12 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Mon, 27 Nov 2017 12:30:12 +0000 (UTC)
Subject: [master] 0c975f6 NULL the pointer first, then destroy VSM segment.
Message-ID: <20171127123012.E57689394B@lists.varnish-cache.org>


commit 0c975f603f3fc1d776f66071ba0b82a280c7029c
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Nov 27 11:50:08 2017 +0000

    NULL the pointer first, then destroy VSM segment.

diff --git a/lib/libvcc/vsctool.py b/lib/libvcc/vsctool.py
index 7acc7a5..0670b82 100644
--- a/lib/libvcc/vsctool.py
+++ b/lib/libvcc/vsctool.py
@@ -216,10 +216,12 @@ class vscset(object):
 		fo.write("VSC_" + self.name + "_Destroy")
 		fo.write("(" + self.struct + " **pp)\n")
 		fo.write("{\n")
+		fo.write("\t" + self.struct + "*p;\n")
 		fo.write("\n")
 		fo.write("\tAN(pp);\n")
-		fo.write('\tVRT_VSC_Destroy(vsc_%s_name, *pp);\n' % self.name)
+		fo.write("\tp = *pp;\n")
 		fo.write("\t*pp = NULL;\n")
+		fo.write('\tVRT_VSC_Destroy(vsc_%s_name, p);\n' % self.name)
 		fo.write("}\n")
 
 		if 'sumfunction' in self.head.param:

From phk at FreeBSD.org  Mon Nov 27 12:30:13 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Mon, 27 Nov 2017 12:30:13 +0000 (UTC)
Subject: [master] d50db26 Close a race between backend probe and
 vcl.state=Cold by removing the be->vsc under backend mtx.
Message-ID: <20171127123013.30F5B93958@lists.varnish-cache.org>


commit d50db264c16c342758f13e9a1940110eb89e227f
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Nov 27 11:54:31 2017 +0000

    Close a race between backend probe and vcl.state=Cold by removing
    the be->vsc under backend mtx.
    
    Fixes #2505

diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c
index 48075d9..d05cb80 100644
--- a/bin/varnishd/cache/cache_backend.c
+++ b/bin/varnishd/cache/cache_backend.c
@@ -335,6 +335,7 @@ static void
 vbe_dir_event(const struct director *d, enum vcl_event_e ev)
 {
 	struct backend *bp;
+	struct VSC_vbe *vsc;
 
 	CHECK_OBJ_NOTNULL(d, DIRECTOR_MAGIC);
 	CAST_OBJ_NOTNULL(bp, d->priv, BACKEND_MAGIC);
@@ -353,7 +354,11 @@ vbe_dir_event(const struct director *d, enum vcl_event_e ev)
 
 	if (ev == VCL_EVENT_COLD) {
 		AN(bp->vsc);
-		VSC_vbe_Destroy(&bp->vsc);
+		Lck_Lock(&backends_mtx);
+		vsc = bp->vsc;
+		bp->vsc = NULL;
+		Lck_Unlock(&backends_mtx);
+		VSC_vbe_Destroy(&vsc);
 		AZ(bp->vsc);
 	}
 }
@@ -524,6 +529,7 @@ void
 VBE_SetHappy(const struct backend *be, uint64_t happy)
 {
 
+	CHECK_OBJ_NOTNULL(be, BACKEND_MAGIC);
 	Lck_Lock(&backends_mtx);
 	if (be->vsc != NULL)
 		be->vsc->happy = happy;
diff --git a/bin/varnishd/cache/cache_vcl.c b/bin/varnishd/cache/cache_vcl.c
index afb4ea0..e042a61 100644
--- a/bin/varnishd/cache/cache_vcl.c
+++ b/bin/varnishd/cache/cache_vcl.c
@@ -997,8 +997,10 @@ vcl_cli_discard(struct cli *cli, const char * const *av, void *priv)
 		free(vcl->loaded_name);
 		AZ(errno=pthread_rwlock_destroy(&vcl->temp_rwl));
 		FREE_OBJ(vcl);
-	} else if (vcl->temp == VCL_TEMP_COLD)
+	} else {
+		assert(vcl->temp == VCL_TEMP_COLD);
 		VCL_Poll();
+	}
 }
 
 static void __match_proto__(cli_func_t)

From phk at FreeBSD.org  Mon Nov 27 12:30:13 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Mon, 27 Nov 2017 12:30:13 +0000 (UTC)
Subject: [master] 5b6377e Get the VCL state tracking precise enough to pass
 our testcases
Message-ID: <20171127123013.51E709395D@lists.varnish-cache.org>


commit 5b6377e3e959145f2ea63f4da6ea9646c88379da
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Nov 27 12:28:28 2017 +0000

    Get the VCL state tracking precise enough to pass our testcases

diff --git a/bin/varnishd/cache/cache_vcl.c b/bin/varnishd/cache/cache_vcl.c
index e042a61..26043ea 100644
--- a/bin/varnishd/cache/cache_vcl.c
+++ b/bin/varnishd/cache/cache_vcl.c
@@ -997,8 +997,7 @@ vcl_cli_discard(struct cli *cli, const char * const *av, void *priv)
 		free(vcl->loaded_name);
 		AZ(errno=pthread_rwlock_destroy(&vcl->temp_rwl));
 		FREE_OBJ(vcl);
-	} else {
-		assert(vcl->temp == VCL_TEMP_COLD);
+	} else if (vcl->temp == VCL_TEMP_COLD) {
 		VCL_Poll();
 	}
 }
diff --git a/bin/varnishd/mgt/mgt_vcl.c b/bin/varnishd/mgt/mgt_vcl.c
index 224082b..671fc21 100644
--- a/bin/varnishd/mgt/mgt_vcl.c
+++ b/bin/varnishd/mgt/mgt_vcl.c
@@ -750,7 +750,7 @@ mcf_vcl_discard(struct cli *cli, const char * const *av, void *priv)
 		(void)mgt_vcl_setstate(cli, vp, VCL_STATE_COLD);
 	if (MCH_Running()) {
 		/* XXX If this fails the child is crashing, figure that later */
-		assert(!vp->warm);
+		assert(vp->state != VCL_STATE_WARM);
 		(void)mgt_cli_askchild(&status, &p, "vcl.discard %s\n", av[2]);
 		free(p);
 	}
diff --git a/bin/varnishtest/tests/v00045.vtc b/bin/varnishtest/tests/v00045.vtc
index 1c4ac7b..a0c5114 100644
--- a/bin/varnishtest/tests/v00045.vtc
+++ b/bin/varnishtest/tests/v00045.vtc
@@ -17,7 +17,7 @@ varnish v1 -cliok "vcl.state vcl1 cold"
 # We should now see it as cooling
 delay 1
 
-varnish v1 -cliexpect "auto/cooling.*vcl1" vcl.list
+varnish v1 -cliexpect "cold/cooling.*vcl1" vcl.list
 
 # It can't be warmed up yet
 delay 1
@@ -25,7 +25,7 @@ varnish v1 -cliexpect "vmod-debug ref on vcl1" "vcl.state vcl1 warm"
 
 # It will eventually cool down
 delay 2
-varnish v1 -cliexpect "auto/cold.*vcl1" vcl.list
+varnish v1 -cliexpect "cold/cold.*vcl1" vcl.list
 
 # At this point it becomes possible to warm up again
 varnish v1 -cliok "vcl.state vcl1 warm"

From daghf at varnish-software.com  Mon Nov 27 16:36:09 2017
From: daghf at varnish-software.com (Dag Haavi Finstad)
Date: Mon, 27 Nov 2017 16:36:09 +0000 (UTC)
Subject: [4.1] e0fd9ba Add a force_fresh parameter to VBT_Get
Message-ID: <20171127163609.E426293389@lists.varnish-cache.org>


commit e0fd9ba67e5234b167214658ba83070cb1b5a3ed
Author: Dag Haavi Finstad <daghf at varnish-software.com>
Date:   Mon Nov 27 16:26:04 2017 +0100

    Add a force_fresh parameter to VBT_Get
    
    Passing a nonzero value will force a fresh backend connection.

diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c
index 905bb13..4133359 100644
--- a/bin/varnishd/cache/cache_backend.c
+++ b/bin/varnishd/cache/cache_backend.c
@@ -91,7 +91,7 @@ vbe_dir_getfd(struct worker *wrk, struct backend *bp, struct busyobj *bo)
 	bo->htc->doclose = SC_NULL;
 
 	FIND_TMO(connect_timeout, tmod, bo, bp);
-	vc = VBT_Get(bp->tcp_pool, tmod, bp, wrk);
+	vc = VBT_Get(bp->tcp_pool, tmod, bp, wrk, 0);
 	if (vc == NULL) {
 		// XXX: Per backend stats ?
 		VSC_C_main->backend_fail++;
diff --git a/bin/varnishd/cache/cache_backend.h b/bin/varnishd/cache/cache_backend.h
index 0bc73ed..d52f2da 100644
--- a/bin/varnishd/cache/cache_backend.h
+++ b/bin/varnishd/cache/cache_backend.h
@@ -126,7 +126,7 @@ int VBT_Open(const struct tcp_pool *tp, double tmo, const struct suckaddr **sa);
 void VBT_Recycle(const struct worker *, struct tcp_pool *, struct vbc **);
 void VBT_Close(struct tcp_pool *tp, struct vbc **vbc);
 struct vbc *VBT_Get(struct tcp_pool *, double tmo, const struct backend *,
-    struct worker *);
+    struct worker *, unsigned force_fresh);
 void VBT_Wait(struct worker *, struct vbc *);
 
 /* cache_vcl.c */
diff --git a/bin/varnishd/cache/cache_backend_tcp.c b/bin/varnishd/cache/cache_backend_tcp.c
index 8e9b660..882d087 100644
--- a/bin/varnishd/cache/cache_backend_tcp.c
+++ b/bin/varnishd/cache/cache_backend_tcp.c
@@ -354,7 +354,7 @@ VBT_Close(struct tcp_pool *tp, struct vbc **vbcp)
 
 struct vbc *
 VBT_Get(struct tcp_pool *tp, double tmo, const struct backend *be,
-    struct worker *wrk)
+    struct worker *wrk, unsigned force_fresh)
 {
 	struct vbc *vbc;
 
@@ -365,7 +365,7 @@ VBT_Get(struct tcp_pool *tp, double tmo, const struct backend *be,
 	Lck_Lock(&tp->mtx);
 	vbc = VTAILQ_FIRST(&tp->connlist);
 	CHECK_OBJ_ORNULL(vbc, VBC_MAGIC);
-	if (vbc == NULL || vbc->state == VBC_STATE_STOLEN)
+	if (force_fresh || vbc == NULL || vbc->state == VBC_STATE_STOLEN)
 		vbc = NULL;
 	else {
 		assert(vbc->tcp_pool == tp);

From daghf at varnish-software.com  Mon Nov 27 16:36:10 2017
From: daghf at varnish-software.com (Dag Haavi Finstad)
Date: Mon, 27 Nov 2017 16:36:10 +0000 (UTC)
Subject: [4.1] a8da6ea Limit backend connection retries to a single retry
Message-ID: <20171127163610.0C2979338B@lists.varnish-cache.org>


commit a8da6ead25479f20acfc23f85e90c1629bfba486
Author: Dag Haavi Finstad <daghf at varnish-software.com>
Date:   Thu Nov 16 13:09:34 2017 +0100

    Limit backend connection retries to a single retry
    
    The second time around, we force a fresh connection.
    
    The VCL user may choose to do 'return (retry);' in vcl_backend_error{}
    if further attempts are deemed warranted.
    
    Fixes: #2135

diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c
index 4133359..bc5a244 100644
--- a/bin/varnishd/cache/cache_backend.c
+++ b/bin/varnishd/cache/cache_backend.c
@@ -59,7 +59,8 @@
  */
 
 static struct vbc *
-vbe_dir_getfd(struct worker *wrk, struct backend *bp, struct busyobj *bo)
+vbe_dir_getfd(struct worker *wrk, struct backend *bp, struct busyobj *bo,
+    unsigned force_fresh)
 {
 	struct vbc *vc;
 	double tmod;
@@ -91,7 +92,7 @@ vbe_dir_getfd(struct worker *wrk, struct backend *bp, struct busyobj *bo)
 	bo->htc->doclose = SC_NULL;
 
 	FIND_TMO(connect_timeout, tmod, bo, bp);
-	vc = VBT_Get(bp->tcp_pool, tmod, bp, wrk, 0);
+	vc = VBT_Get(bp->tcp_pool, tmod, bp, wrk, force_fresh);
 	if (vc == NULL) {
 		// XXX: Per backend stats ?
 		VSC_C_main->backend_fail++;
@@ -196,7 +197,7 @@ vbe_dir_gethdrs(const struct director *d, struct worker *wrk,
 		http_PrintfHeader(bo->bereq, "Host: %s", bp->hosthdr);
 
 	do {
-		vbc = vbe_dir_getfd(wrk, bp, bo);
+		vbc = vbe_dir_getfd(wrk, bp, bo, extrachance == 0);
 		if (vbc == NULL) {
 			VSLb(bo->vsl, SLT_FetchError, "no backend connection");
 			return (-1);
@@ -233,7 +234,7 @@ vbe_dir_gethdrs(const struct director *d, struct worker *wrk,
 		    bo->req->req_body_status != REQ_BODY_CACHED)
 			break;
 		VSC_C_main->backend_retry++;
-	} while (extrachance);
+	} while (extrachance--);
 	return (-1);
 }
 
@@ -289,7 +290,7 @@ vbe_dir_http1pipe(const struct director *d, struct req *req, struct busyobj *bo)
 
 	req->res_mode = RES_PIPE;
 
-	vbc = vbe_dir_getfd(req->wrk, bp, bo);
+	vbc = vbe_dir_getfd(req->wrk, bp, bo, 0);
 
 	if (vbc == NULL) {
 		VSLb(bo->vsl, SLT_FetchError, "no backend connection");
diff --git a/bin/varnishtest/tests/r02135.vtc b/bin/varnishtest/tests/r02135.vtc
new file mode 100644
index 0000000..3868bd3
--- /dev/null
+++ b/bin/varnishtest/tests/r02135.vtc
@@ -0,0 +1,40 @@
+varnishtest "#2135: fetch retry logic"
+
+barrier b1 cond 2
+
+server s1 {
+	rxreq
+	txresp
+	rxreq
+	expect req.url == "/foo"
+	delay 2.5
+	send " "
+	expect_close
+	accept
+	rxreq
+	expect req.url == "/foo"
+	barrier b1 sync
+	delay 2.5
+	send " "
+	expect_close
+} -start
+
+varnish v1 -cliok "param.set between_bytes_timeout 1"
+varnish v1 -cliok "param.set first_byte_timeout 1"
+
+varnish v1 -vcl+backend {
+	sub vcl_backend_error {
+		set beresp.http.url = bereq.url;
+	}
+} -start
+
+client c1 {
+	txreq
+	rxresp
+	expect resp.status == "200"
+	txreq -url "/foo"
+	barrier b1 sync
+	rxresp
+	expect resp.status == "503"
+	expect resp.http.url == "/foo"
+} -run

From daghf at varnish-software.com  Mon Nov 27 16:36:10 2017
From: daghf at varnish-software.com (Dag Haavi Finstad)
Date: Mon, 27 Nov 2017 16:36:10 +0000 (UTC)
Subject: [4.1] 9b61484 r02135.vtc test case fixes
Message-ID: <20171127163610.2F2E99338E@lists.varnish-cache.org>


commit 9b614844386c24c41a224857c44d85ba4d088afc
Author: Dag Haavi Finstad <daghf at varnish-software.com>
Date:   Thu Nov 23 16:08:40 2017 +0100

    r02135.vtc test case fixes
    
    This test case should not rely on
    first_byte_timeout/between_bytes_timeout.

diff --git a/bin/varnishtest/tests/r02135.vtc b/bin/varnishtest/tests/r02135.vtc
index 3868bd3..7f9182f 100644
--- a/bin/varnishtest/tests/r02135.vtc
+++ b/bin/varnishtest/tests/r02135.vtc
@@ -7,21 +7,15 @@ server s1 {
 	txresp
 	rxreq
 	expect req.url == "/foo"
-	delay 2.5
-	send " "
-	expect_close
+	close
 	accept
 	rxreq
 	expect req.url == "/foo"
 	barrier b1 sync
-	delay 2.5
-	send " "
+	close
 	expect_close
 } -start
 
-varnish v1 -cliok "param.set between_bytes_timeout 1"
-varnish v1 -cliok "param.set first_byte_timeout 1"
-
 varnish v1 -vcl+backend {
 	sub vcl_backend_error {
 		set beresp.http.url = bereq.url;

From daghf at varnish-software.com  Mon Nov 27 16:36:10 2017
From: daghf at varnish-software.com (Dag Haavi Finstad)
Date: Mon, 27 Nov 2017 16:36:10 +0000 (UTC)
Subject: [4.1] 68a35e1 Make VBT_Close capable of dealing with STOLEN vtps
Message-ID: <20171127163610.5874A93394@lists.varnish-cache.org>


commit 68a35e100ad711415fac16f0db3d9cb4a7e94867
Author: Dag Haavi Finstad <daghf at varnish-software.com>
Date:   Thu Nov 23 13:47:44 2017 +0100

    Make VBT_Close capable of dealing with STOLEN vtps
    
    The change from shutdown(.., SHUT_WR) to shutdown(.., SHUT_RDWR) is
    required to make it trigger a waiter event.

diff --git a/bin/varnishd/cache/cache_backend_tcp.c b/bin/varnishd/cache/cache_backend_tcp.c
index 882d087..e80b3c7 100644
--- a/bin/varnishd/cache/cache_backend_tcp.c
+++ b/bin/varnishd/cache/cache_backend_tcp.c
@@ -329,13 +329,14 @@ VBT_Close(struct tcp_pool *tp, struct vbc **vbcp)
 	*vbcp = NULL;
 	CHECK_OBJ_NOTNULL(vbc, VBC_MAGIC);
 
-	assert(vbc->state == VBC_STATE_USED);
 	assert(vbc->fd > 0);
 
 	Lck_Lock(&tp->mtx);
+	assert(vbc->state == VBC_STATE_USED || vbc->state == VBC_STATE_STOLEN);
 	tp->n_used--;
 	if (vbc->state == VBC_STATE_STOLEN) {
-		(void)shutdown(vbc->fd, SHUT_WR);
+		(void)shutdown(vbc->fd, SHUT_RDWR);
+		VTAILQ_REMOVE(&tp->connlist, vbc, list);
 		vbc->state = VBC_STATE_CLEANUP;
 		VTAILQ_INSERT_HEAD(&tp->killlist, vbc, list);
 		tp->n_kill++;

From daghf at varnish-software.com  Mon Nov 27 16:36:10 2017
From: daghf at varnish-software.com (Dag Haavi Finstad)
Date: Mon, 27 Nov 2017 16:36:10 +0000 (UTC)
Subject: [4.1] c36ed16 Drop VBT_Wait call in vbe_dir_finish
Message-ID: <20171127163610.7ED3693398@lists.varnish-cache.org>


commit c36ed165b5c96da72af34373eb9f56c550f08d96
Author: Dag Haavi Finstad <daghf at varnish-software.com>
Date:   Fri Nov 24 16:13:08 2017 +0100

    Drop VBT_Wait call in vbe_dir_finish
    
    With VBT_Close now being capable of dealing with STOLEN connections, we
    no longer need to VBT_Wait for them prior to close.

diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c
index bc5a244..491259c 100644
--- a/bin/varnishd/cache/cache_backend.c
+++ b/bin/varnishd/cache/cache_backend.c
@@ -152,13 +152,15 @@ vbe_dir_finish(const struct director *d, struct worker *wrk,
 	CAST_OBJ_NOTNULL(vbc, bo->htc->priv, VBC_MAGIC);
 	bo->htc->priv = NULL;
 	if (vbc->state != VBC_STATE_USED)
-		VBT_Wait(wrk, vbc);
+		assert(bo->htc->doclose == SC_TX_PIPE);
 	if (bo->htc->doclose != SC_NULL) {
 		VSLb(bo->vsl, SLT_BackendClose, "%d %s", vbc->fd,
 		    bp->display_name);
 		VBT_Close(bp->tcp_pool, &vbc);
+		AZ(vbc);
 		Lck_Lock(&bp->mtx);
 	} else {
+		assert (vbc->state == VBC_STATE_USED);
 		VSLb(bo->vsl, SLT_BackendReuse, "%d %s", vbc->fd,
 		    bp->display_name);
 		Lck_Lock(&bp->mtx);

From daghf at varnish-software.com  Mon Nov 27 16:36:10 2017
From: daghf at varnish-software.com (Dag Haavi Finstad)
Date: Mon, 27 Nov 2017 16:36:10 +0000 (UTC)
Subject: [4.1] 9754715 Honor first_byte_timeout for recycled backend
 connections
Message-ID: <20171127163610.AB9349339D@lists.varnish-cache.org>


commit 9754715a4f357a9eb069b0233bf1f36d75626a3b
Author: Dag Haavi Finstad <daghf at varnish-software.com>
Date:   Fri Nov 24 16:22:55 2017 +0100

    Honor first_byte_timeout for recycled backend connections
    
    Fixes: #1772

diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c
index 491259c..a6358db 100644
--- a/bin/varnishd/cache/cache_backend.c
+++ b/bin/varnishd/cache/cache_backend.c
@@ -152,7 +152,8 @@ vbe_dir_finish(const struct director *d, struct worker *wrk,
 	CAST_OBJ_NOTNULL(vbc, bo->htc->priv, VBC_MAGIC);
 	bo->htc->priv = NULL;
 	if (vbc->state != VBC_STATE_USED)
-		assert(bo->htc->doclose == SC_TX_PIPE);
+		assert(bo->htc->doclose == SC_TX_PIPE ||
+		    bo->htc->doclose == SC_RX_TIMEOUT);
 	if (bo->htc->doclose != SC_NULL) {
 		VSLb(bo->vsl, SLT_BackendClose, "%d %s", vbc->fd,
 		    bp->display_name);
@@ -210,16 +211,24 @@ vbe_dir_gethdrs(const struct director *d, struct worker *wrk,
 
 		i = V1F_SendReq(wrk, bo, &bo->acct.bereq_hdrbytes, 0);
 
-		if (vbc->state != VBC_STATE_USED)
-			VBT_Wait(wrk, vbc);
-
-		assert(vbc->state == VBC_STATE_USED);
+		if (vbc->state != VBC_STATE_USED) {
+			if (VBT_Wait(wrk, vbc, VTIM_real() +
+			    bo->htc->first_byte_timeout) != 0) {
+				bo->htc->doclose = SC_RX_TIMEOUT;
+				VSLb(bo->vsl, SLT_FetchError,
+				     "Timed out reusing backend connection");
+				extrachance = 0;
+			}
+		}
 
-		if (i == 0)
-			i = V1F_FetchRespHdr(bo);
-		if (i == 0) {
-			AN(bo->htc->priv);
-			return (0);
+		if (bo->htc->doclose == SC_NULL) {
+			assert(vbc->state == VBC_STATE_USED);
+			if (i == 0)
+				i = V1F_FetchRespHdr(bo);
+			if (i == 0) {
+				AN(bo->htc->priv);
+				return (0);
+			}
 		}
 
 		/*
@@ -229,7 +238,7 @@ vbe_dir_gethdrs(const struct director *d, struct worker *wrk,
 		 */
 		vbe_dir_finish(d, wrk, bo);
 		AZ(bo->htc);
-		if (i < 0)
+		if (i < 0 || extrachance == 0)
 			break;
 		if (bo->req != NULL &&
 		    bo->req->req_body_status != REQ_BODY_NONE &&
diff --git a/bin/varnishd/cache/cache_backend.h b/bin/varnishd/cache/cache_backend.h
index d52f2da..65905ed 100644
--- a/bin/varnishd/cache/cache_backend.h
+++ b/bin/varnishd/cache/cache_backend.h
@@ -127,7 +127,7 @@ void VBT_Recycle(const struct worker *, struct tcp_pool *, struct vbc **);
 void VBT_Close(struct tcp_pool *tp, struct vbc **vbc);
 struct vbc *VBT_Get(struct tcp_pool *, double tmo, const struct backend *,
     struct worker *, unsigned force_fresh);
-void VBT_Wait(struct worker *, struct vbc *);
+int VBT_Wait(struct worker *, struct vbc *, double tmo);
 
 /* cache_vcl.c */
 int VCL_AddBackend(struct vcl *, struct backend *);
diff --git a/bin/varnishd/cache/cache_backend_tcp.c b/bin/varnishd/cache/cache_backend_tcp.c
index e80b3c7..49d3175 100644
--- a/bin/varnishd/cache/cache_backend_tcp.c
+++ b/bin/varnishd/cache/cache_backend_tcp.c
@@ -34,6 +34,7 @@
 
 #include "config.h"
 
+#include <errno.h>
 #include <stdlib.h>
 
 #include "cache.h"
@@ -405,10 +406,11 @@ VBT_Get(struct tcp_pool *tp, double tmo, const struct backend *be,
 /*--------------------------------------------------------------------
  */
 
-void
-VBT_Wait(struct worker *wrk, struct vbc *vbc)
+int
+VBT_Wait(struct worker *wrk, struct vbc *vbc, double tmo)
 {
 	struct tcp_pool *tp;
+	int r;
 
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
 	CHECK_OBJ_NOTNULL(vbc, VBC_MAGIC);
@@ -416,11 +418,23 @@ VBT_Wait(struct worker *wrk, struct vbc *vbc)
 	CHECK_OBJ_NOTNULL(tp, TCP_POOL_MAGIC);
 	assert(vbc->cond == &wrk->cond);
 	Lck_Lock(&tp->mtx);
-	while (vbc->state == VBC_STATE_STOLEN)
-		AZ(Lck_CondWait(&wrk->cond, &tp->mtx, 0));
+
+	while (vbc->state == VBC_STATE_STOLEN) {
+		r = Lck_CondWait(&wrk->cond, &tp->mtx, tmo);
+		if (r != 0) {
+			if (r == EINTR)
+				continue;
+			assert(r == ETIMEDOUT);
+			Lck_Unlock(&tp->mtx);
+			return (1);
+		}
+	}
+
 	assert(vbc->state == VBC_STATE_USED);
 	vbc->cond = NULL;
 	Lck_Unlock(&tp->mtx);
+
+	return (0);
 }
 
 /*--------------------------------------------------------------------*/
diff --git a/bin/varnishtest/tests/r01772.vtc b/bin/varnishtest/tests/r01772.vtc
new file mode 100644
index 0000000..93c5e1b
--- /dev/null
+++ b/bin/varnishtest/tests/r01772.vtc
@@ -0,0 +1,24 @@
+varnishtest "#1772: Honor first_byte_timeout on a recycled connection"
+
+server s1 {
+	rxreq
+	expect req.url == "/first"
+	txresp
+
+	rxreq
+	expect req.url == "/second"
+	delay 2
+	txresp
+} -start
+
+varnish v1 -arg "-p first_byte_timeout=1" -vcl+backend {} -start
+
+client c1 {
+	txreq -url "/first"
+	rxresp
+	expect resp.status == 200
+
+	txreq -url "/second"
+	rxresp
+	expect resp.status == 503
+} -run

From nils.goroll at uplex.de  Tue Nov 28 12:11:10 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Tue, 28 Nov 2017 12:11:10 +0000 (UTC)
Subject: [master] e1535c8 gc beresp.storage_hint
Message-ID: <20171128121110.D479D934A1@lists.varnish-cache.org>


commit e1535c8d14aa9b7a796b426101780e7237e8ab97
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Tue Nov 28 08:47:15 2017 +0100

    gc beresp.storage_hint
    
    it was deprecated since varnish 5.1.
    
    motivated by the bereq.retries cleanup, see #2405

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index 14ba352..4b27caf 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -443,7 +443,6 @@ struct busyobj {
 	/* Acct */
 	struct acct_bereq	acct;
 
-	const char		*storage_hint;
 	const struct stevedore	*storage;
 	const struct director	*director_req;
 	const struct director	*director_resp;
diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c
index 2ad7854..cf3389a 100644
--- a/bin/varnishd/cache/cache_fetch.c
+++ b/bin/varnishd/cache/cache_fetch.c
@@ -63,7 +63,6 @@ vbf_allocobj(struct busyobj *bo, unsigned l)
 		stv = bo->storage;
 
 	bo->storage = NULL;
-	bo->storage_hint = NULL;
 
 	if (stv == NULL)
 		return (0);
@@ -175,7 +174,6 @@ vbf_stp_mkbereq(struct worker *wrk, struct busyobj *bo)
 
 	assert(bo->fetch_objcore->boc->state == BOS_INVALID);
 	AZ(bo->storage);
-	AZ(bo->storage_hint);
 
 	HTTP_Setup(bo->bereq0, bo->ws, bo->vsl, SLT_BereqMethod);
 	http_FilterReq(bo->bereq0, bo->req->http,
@@ -238,7 +236,6 @@ vbf_stp_retry(struct worker *wrk, struct busyobj *bo)
 
 	/* reset other bo attributes - See VBO_GetBusyObj */
 	bo->storage = NULL;
-	bo->storage_hint = NULL;
 	bo->do_esi = 0;
 	bo->do_stream = 1;
 
@@ -264,7 +261,6 @@ vbf_stp_startfetch(struct worker *wrk, struct busyobj *bo)
 	CHECK_OBJ_NOTNULL(bo, BUSYOBJ_MAGIC);
 
 	AZ(bo->storage);
-	AZ(bo->storage_hint);
 
 	bo->storage = STV_next();
 
diff --git a/bin/varnishd/cache/cache_vrt_var.c b/bin/varnishd/cache/cache_vrt_var.c
index 0f1d018..01e5997 100644
--- a/bin/varnishd/cache/cache_vrt_var.c
+++ b/bin/varnishd/cache/cache_vrt_var.c
@@ -330,42 +330,6 @@ VRT_r_beresp_backend_ip(VRT_CTX)
 
 /*--------------------------------------------------------------------*/
 
-const char *
-VRT_r_beresp_storage_hint(VRT_CTX)
-{
-	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
-	CHECK_OBJ_NOTNULL(ctx->bo, BUSYOBJ_MAGIC);
-	if (ctx->bo->storage_hint != NULL)
-		return (ctx->bo->storage_hint);
-	else
-		return (NULL);
-}
-
-void
-VRT_l_beresp_storage_hint(VRT_CTX, const char *str, ...)
-{
-	const struct stevedore *stv;
-	va_list ap;
-	const char *b;
-
-	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
-	CHECK_OBJ_NOTNULL(ctx->bo, BUSYOBJ_MAGIC);
-	va_start(ap, str);
-	b = VRT_String(ctx->bo->ws, NULL, str, ap);	// XXX: ctx->ws ?
-	va_end(ap);
-	if (b == NULL) {
-		VSLb(ctx->vsl, SLT_LostHeader, "storage_hint");
-		WS_MarkOverflow(ctx->bo->beresp->ws);
-		return;
-	}
-	ctx->bo->storage_hint = b;
-	stv = STV_find(b);
-	if (stv != NULL)
-		ctx->bo->storage = stv;
-}
-
-/*--------------------------------------------------------------------*/
-
 VCL_STEVEDORE
 VRT_r_req_storage(VRT_CTX)
 {
diff --git a/bin/varnishtest/tests/c00078.vtc b/bin/varnishtest/tests/c00078.vtc
index b1fcc60..d5464ef 100644
--- a/bin/varnishtest/tests/c00078.vtc
+++ b/bin/varnishtest/tests/c00078.vtc
@@ -1,4 +1,4 @@
-varnishtest "Stevedores RR, beresp.storage and beresp.storage_hint"
+varnishtest "Stevedores RR, beresp.storage"
 
 server s1 -repeat 6 {
 	rxreq
@@ -12,10 +12,8 @@ varnish v1 \
     -vcl+backend {
 	import vtc;
 	sub vcl_backend_response {
-		if (bereq.url == "/1") {
-			set beresp.storage_hint = "invalid";
-		} else if (bereq.url == "/2") {
-			set beresp.storage_hint = "s1";
+		if (bereq.url == "/2") {
+			set beresp.storage = storage.s1;
 		} else if (bereq.url == "/6") {
 			set beresp.storage = vtc.no_stevedore();
 		}
diff --git a/bin/varnishtest/tests/v00025.vtc b/bin/varnishtest/tests/v00025.vtc
index 8e96582..aadaa83 100644
--- a/bin/varnishtest/tests/v00025.vtc
+++ b/bin/varnishtest/tests/v00025.vtc
@@ -43,7 +43,6 @@ varnish v1 -arg "-i J.F.Nobody" -vcl+backend {
 		set beresp.http.beresp_backend = beresp.backend;
 		set beresp.http.keep = beresp.keep;
 		set beresp.http.stv = beresp.storage;
-		set beresp.http.hint = beresp.storage_hint;
 		set beresp.http.be_ip = beresp.backend.ip;
 		set beresp.http.be_nm = beresp.backend.name;
 		set beresp.http.unc = bereq.uncacheable;
diff --git a/doc/changes.rst b/doc/changes.rst
index 0e70047..fe09dea 100644
--- a/doc/changes.rst
+++ b/doc/changes.rst
@@ -41,6 +41,8 @@ VCL
   ``req.hash_always_miss`` are now accessible from all of the client
   side subs, not just ``vcl_recv{}``
 
+* Removed ``beresp.storage_hint`` (was deprecated since Varnish 5.1)
+
 C APIs (for vmod and utility authors)
 -------------------------------------
 
diff --git a/lib/libvcc/generate.py b/lib/libvcc/generate.py
index 524e4b3..3b4972b 100755
--- a/lib/libvcc/generate.py
+++ b/lib/libvcc/generate.py
@@ -670,15 +670,6 @@ sp_variables = [
 		The storage backend to use to save this object.
 		"""
 	),
-	('beresp.storage_hint',
-		'STRING',
-		('backend_response', 'backend_error'),
-		('backend_response', 'backend_error'), """
-		Deprecated. Hint to Varnish that you want to
-		save this object to a particular storage backend.
-		Use beresp.storage instead.
-		"""
-	),
 	('obj.proto',
 		'STRING',
 		('hit',),

From dridi at varni.sh  Tue Nov 28 12:43:18 2017
From: dridi at varni.sh (Dridi Boukelmoune)
Date: Tue, 28 Nov 2017 13:43:18 +0100
Subject: [master] e1535c8 gc beresp.storage_hint
In-Reply-To: <20171128121110.D479D934A1@lists.varnish-cache.org>
References: <20171128121110.D479D934A1@lists.varnish-cache.org>
Message-ID: <CABoVN9AKeLrBhPknyXtPiB0xVu5E0t4+vDmx9jm3ON+XUXBq7g@mail.gmail.com>

On Tue, Nov 28, 2017 at 1:11 PM, Nils Goroll <nils.goroll at uplex.de> wrote:
>
> commit e1535c8d14aa9b7a796b426101780e7237e8ab97
> Author: Nils Goroll <nils.goroll at uplex.de>
> Date:   Tue Nov 28 08:47:15 2017 +0100
>
>     gc beresp.storage_hint
>
>     it was deprecated since varnish 5.1.
>
>     motivated by the bereq.retries cleanup, see #2405

We're planning to support both vcl 4.0 and vcl 4.1 in varnish 6.0, but
this is a breaking change for vcl 4.0, isn't it?

> diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
> index 14ba352..4b27caf 100644
> --- a/bin/varnishd/cache/cache.h
> +++ b/bin/varnishd/cache/cache.h
> @@ -443,7 +443,6 @@ struct busyobj {
>         /* Acct */
>         struct acct_bereq       acct;
>
> -       const char              *storage_hint;
>         const struct stevedore  *storage;
>         const struct director   *director_req;
>         const struct director   *director_resp;
> diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c
> index 2ad7854..cf3389a 100644
> --- a/bin/varnishd/cache/cache_fetch.c
> +++ b/bin/varnishd/cache/cache_fetch.c
> @@ -63,7 +63,6 @@ vbf_allocobj(struct busyobj *bo, unsigned l)
>                 stv = bo->storage;
>
>         bo->storage = NULL;
> -       bo->storage_hint = NULL;
>
>         if (stv == NULL)
>                 return (0);
> @@ -175,7 +174,6 @@ vbf_stp_mkbereq(struct worker *wrk, struct busyobj *bo)
>
>         assert(bo->fetch_objcore->boc->state == BOS_INVALID);
>         AZ(bo->storage);
> -       AZ(bo->storage_hint);
>
>         HTTP_Setup(bo->bereq0, bo->ws, bo->vsl, SLT_BereqMethod);
>         http_FilterReq(bo->bereq0, bo->req->http,
> @@ -238,7 +236,6 @@ vbf_stp_retry(struct worker *wrk, struct busyobj *bo)
>
>         /* reset other bo attributes - See VBO_GetBusyObj */
>         bo->storage = NULL;
> -       bo->storage_hint = NULL;
>         bo->do_esi = 0;
>         bo->do_stream = 1;
>
> @@ -264,7 +261,6 @@ vbf_stp_startfetch(struct worker *wrk, struct busyobj *bo)
>         CHECK_OBJ_NOTNULL(bo, BUSYOBJ_MAGIC);
>
>         AZ(bo->storage);
> -       AZ(bo->storage_hint);
>
>         bo->storage = STV_next();
>
> diff --git a/bin/varnishd/cache/cache_vrt_var.c b/bin/varnishd/cache/cache_vrt_var.c
> index 0f1d018..01e5997 100644
> --- a/bin/varnishd/cache/cache_vrt_var.c
> +++ b/bin/varnishd/cache/cache_vrt_var.c
> @@ -330,42 +330,6 @@ VRT_r_beresp_backend_ip(VRT_CTX)
>
>  /*--------------------------------------------------------------------*/
>
> -const char *
> -VRT_r_beresp_storage_hint(VRT_CTX)
> -{
> -       CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
> -       CHECK_OBJ_NOTNULL(ctx->bo, BUSYOBJ_MAGIC);
> -       if (ctx->bo->storage_hint != NULL)
> -               return (ctx->bo->storage_hint);
> -       else
> -               return (NULL);
> -}
> -
> -void
> -VRT_l_beresp_storage_hint(VRT_CTX, const char *str, ...)
> -{
> -       const struct stevedore *stv;
> -       va_list ap;
> -       const char *b;
> -
> -       CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
> -       CHECK_OBJ_NOTNULL(ctx->bo, BUSYOBJ_MAGIC);
> -       va_start(ap, str);
> -       b = VRT_String(ctx->bo->ws, NULL, str, ap);     // XXX: ctx->ws ?
> -       va_end(ap);
> -       if (b == NULL) {
> -               VSLb(ctx->vsl, SLT_LostHeader, "storage_hint");
> -               WS_MarkOverflow(ctx->bo->beresp->ws);
> -               return;
> -       }
> -       ctx->bo->storage_hint = b;
> -       stv = STV_find(b);
> -       if (stv != NULL)
> -               ctx->bo->storage = stv;
> -}
> -
> -/*--------------------------------------------------------------------*/
> -
>  VCL_STEVEDORE
>  VRT_r_req_storage(VRT_CTX)
>  {
> diff --git a/bin/varnishtest/tests/c00078.vtc b/bin/varnishtest/tests/c00078.vtc
> index b1fcc60..d5464ef 100644
> --- a/bin/varnishtest/tests/c00078.vtc
> +++ b/bin/varnishtest/tests/c00078.vtc
> @@ -1,4 +1,4 @@
> -varnishtest "Stevedores RR, beresp.storage and beresp.storage_hint"
> +varnishtest "Stevedores RR, beresp.storage"
>
>  server s1 -repeat 6 {
>         rxreq
> @@ -12,10 +12,8 @@ varnish v1 \
>      -vcl+backend {
>         import vtc;
>         sub vcl_backend_response {
> -               if (bereq.url == "/1") {
> -                       set beresp.storage_hint = "invalid";
> -               } else if (bereq.url == "/2") {
> -                       set beresp.storage_hint = "s1";
> +               if (bereq.url == "/2") {
> +                       set beresp.storage = storage.s1;
>                 } else if (bereq.url == "/6") {
>                         set beresp.storage = vtc.no_stevedore();
>                 }
> diff --git a/bin/varnishtest/tests/v00025.vtc b/bin/varnishtest/tests/v00025.vtc
> index 8e96582..aadaa83 100644
> --- a/bin/varnishtest/tests/v00025.vtc
> +++ b/bin/varnishtest/tests/v00025.vtc
> @@ -43,7 +43,6 @@ varnish v1 -arg "-i J.F.Nobody" -vcl+backend {
>                 set beresp.http.beresp_backend = beresp.backend;
>                 set beresp.http.keep = beresp.keep;
>                 set beresp.http.stv = beresp.storage;
> -               set beresp.http.hint = beresp.storage_hint;
>                 set beresp.http.be_ip = beresp.backend.ip;
>                 set beresp.http.be_nm = beresp.backend.name;
>                 set beresp.http.unc = bereq.uncacheable;
> diff --git a/doc/changes.rst b/doc/changes.rst
> index 0e70047..fe09dea 100644
> --- a/doc/changes.rst
> +++ b/doc/changes.rst
> @@ -41,6 +41,8 @@ VCL
>    ``req.hash_always_miss`` are now accessible from all of the client
>    side subs, not just ``vcl_recv{}``
>
> +* Removed ``beresp.storage_hint`` (was deprecated since Varnish 5.1)
> +
>  C APIs (for vmod and utility authors)
>  -------------------------------------
>
> diff --git a/lib/libvcc/generate.py b/lib/libvcc/generate.py
> index 524e4b3..3b4972b 100755
> --- a/lib/libvcc/generate.py
> +++ b/lib/libvcc/generate.py
> @@ -670,15 +670,6 @@ sp_variables = [
>                 The storage backend to use to save this object.
>                 """
>         ),
> -       ('beresp.storage_hint',
> -               'STRING',
> -               ('backend_response', 'backend_error'),
> -               ('backend_response', 'backend_error'), """
> -               Deprecated. Hint to Varnish that you want to
> -               save this object to a particular storage backend.
> -               Use beresp.storage instead.
> -               """
> -       ),
>         ('obj.proto',
>                 'STRING',
>                 ('hit',),
> _______________________________________________
> varnish-commit mailing list
> varnish-commit at varnish-cache.org
> https://www.varnish-cache.org/lists/mailman/listinfo/varnish-commit

From nils.goroll at uplex.de  Tue Nov 28 12:46:07 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Tue, 28 Nov 2017 12:46:07 +0000 (UTC)
Subject: [master] 96913be Fail gracefully if shard.backend() is called in
 housekeeping subs
Message-ID: <20171128124607.77B26933AD@lists.varnish-cache.org>


commit 96913becedb1e1c98bac6b649350d4b33da2ec24
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Tue Nov 28 13:42:28 2017 +0100

    Fail gracefully if shard.backend() is called in housekeeping subs
    
    Fixes #2506

diff --git a/lib/libvmod_directors/vmod_shard.c b/lib/libvmod_directors/vmod_shard.c
index 984c3ed..1893142 100644
--- a/lib/libvmod_directors/vmod_shard.c
+++ b/lib/libvmod_directors/vmod_shard.c
@@ -33,6 +33,7 @@
 #include <string.h>
 
 #include "cache/cache.h"
+#include "vcl.h"
 
 #include "vend.h"
 
@@ -234,6 +235,13 @@ vmod_shard_backend(VRT_CTX, struct vmod_directors_shard *vshard,
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
 	CHECK_OBJ_NOTNULL(vshard, VMOD_SHARD_SHARD_MAGIC);
 
+	/* TODO #2500 */
+	if ((ctx->method & (VCL_MET_TASK_C | VCL_MET_TASK_B)) == 0) {
+		VRT_fail(ctx, "shard .backend() method may only be used "
+			 "in client and backend context");
+		return NULL;
+	}
+
 	if (key_int && by != BY_KEY) {
 		shard_err(ctx, vshard->shardd,
 		    "by=%s but key argument used", by_s);

From nils.goroll at uplex.de  Tue Nov 28 12:58:43 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Tue, 28 Nov 2017 13:58:43 +0100
Subject: [master] e1535c8 gc beresp.storage_hint
In-Reply-To: <CABoVN9AKeLrBhPknyXtPiB0xVu5E0t4+vDmx9jm3ON+XUXBq7g@mail.gmail.com>
References: <20171128121110.D479D934A1@lists.varnish-cache.org>
 <CABoVN9AKeLrBhPknyXtPiB0xVu5E0t4+vDmx9jm3ON+XUXBq7g@mail.gmail.com>
Message-ID: <0b472c2a-a794-296d-cc3b-a09956e818bf@uplex.de>

On 28/11/17 13:43, Dridi Boukelmoune wrote:
> We're planning to support both vcl 4.0 and vcl 4.1 in varnish 6.0, but
> this is a breaking change for vcl 4.0, isn't it?

Good point, but my understanding was that we wanted to support generic vcl 4.0
_syntax_ where phks upcoming work is going to break it.

If we really wanted to keep beresp.storage_hint I'd suggest to bring it back
just wrapping beresp.storage so that we can remove the struct busyobj member
storage_hint.

More comments?

Nils

-- 

** * * UPLEX - Nils Goroll Systemoptimierung

Scheffelstra?e 32
22301 Hamburg

tel +49 40 28805731
mob +49 170 2723133
fax +49 40 42949753

xmpp://slink at jabber.int.uplex.de/

http://uplex.de/

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: OpenPGP digital signature
URL: <https://www.varnish-cache.org/lists/pipermail/varnish-commit/attachments/20171128/49ce72bb/attachment.bin>

From fgsch at lodoss.net  Tue Nov 28 19:26:54 2017
From: fgsch at lodoss.net (Federico Schwindt)
Date: Tue, 28 Nov 2017 19:26:54 +0000
Subject: [master] e1535c8 gc beresp.storage_hint
In-Reply-To: <0b472c2a-a794-296d-cc3b-a09956e818bf@uplex.de>
References: <20171128121110.D479D934A1@lists.varnish-cache.org>
 <CABoVN9AKeLrBhPknyXtPiB0xVu5E0t4+vDmx9jm3ON+XUXBq7g@mail.gmail.com>
 <0b472c2a-a794-296d-cc3b-a09956e818bf@uplex.de>
Message-ID: <CAJV_h0ayxg9taKnf=xbSaxy2e5OeuZxgCZ2wGJReyP-ztJyL4Q@mail.gmail.com>

My understanding when I did this was that we were going to leave these
variables around until after 6.0 (or whatever is the next major release).

On Tue, Nov 28, 2017 at 12:58 PM, Nils Goroll <nils.goroll at uplex.de> wrote:

> On 28/11/17 13:43, Dridi Boukelmoune wrote:
> > We're planning to support both vcl 4.0 and vcl 4.1 in varnish 6.0, but
> > this is a breaking change for vcl 4.0, isn't it?
>
> Good point, but my understanding was that we wanted to support generic vcl
> 4.0
> _syntax_ where phks upcoming work is going to break it.
>
> If we really wanted to keep beresp.storage_hint I'd suggest to bring it
> back
> just wrapping beresp.storage so that we can remove the struct busyobj
> member
> storage_hint.
>
> More comments?
>
> Nils
>
> --
>
> ** * * UPLEX - Nils Goroll Systemoptimierung
>
> Scheffelstra?e 32
> 22301 Hamburg
>
> tel +49 40 28805731
> mob +49 170 2723133
> fax +49 40 42949753
>
> xmpp://slink at jabber.int.uplex.de/
>
> http://uplex.de/
>
>
> _______________________________________________
> varnish-commit mailing list
> varnish-commit at varnish-cache.org
> https://www.varnish-cache.org/lists/mailman/listinfo/varnish-commit
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://www.varnish-cache.org/lists/pipermail/varnish-commit/attachments/20171128/c14b8ce2/attachment.html>

From fgsch at lodoss.net  Tue Nov 28 23:31:06 2017
From: fgsch at lodoss.net (Federico G. Schwindt)
Date: Tue, 28 Nov 2017 23:31:06 +0000 (UTC)
Subject: [master] 191b893 More tests dropping
Message-ID: <20171128233106.4A6DE932A2@lists.varnish-cache.org>


commit 191b8934ee9c48dc77233cad8fbc40aa7a47b53c
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Tue Nov 28 19:53:52 2017 +0000

    More tests dropping

diff --git a/.gitignore b/.gitignore
index b534a42..01b60d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -116,6 +116,7 @@ cscope.*out
 /include/vrt_test
 /include/vbm_test
 /lib/libvarnish/*.log
+/lib/libvarnish/binheap
 /lib/libvarnish/vnum_c_test
 /lib/libvarnishapi/*.log
 /lib/libvarnishapi/vjsn_test

From nils.goroll at uplex.de  Wed Nov 29 09:27:55 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Wed, 29 Nov 2017 10:27:55 +0100
Subject: [master] e1535c8 gc beresp.storage_hint
In-Reply-To: <CAJV_h0ayxg9taKnf=xbSaxy2e5OeuZxgCZ2wGJReyP-ztJyL4Q@mail.gmail.com>
References: <20171128121110.D479D934A1@lists.varnish-cache.org>
 <CABoVN9AKeLrBhPknyXtPiB0xVu5E0t4+vDmx9jm3ON+XUXBq7g@mail.gmail.com>
 <0b472c2a-a794-296d-cc3b-a09956e818bf@uplex.de>
 <CAJV_h0ayxg9taKnf=xbSaxy2e5OeuZxgCZ2wGJReyP-ztJyL4Q@mail.gmail.com>
Message-ID: <0a442ad7-e742-952d-fab4-d2467354f88e@uplex.de>

On 28/11/17 20:26, Federico Schwindt wrote:
> My understanding when I did this was that we were going to leave these variables
> around until after 6.0 (or whatever is the next major release).

So revert?

-- 

** * * UPLEX - Nils Goroll Systemoptimierung

Scheffelstra?e 32
22301 Hamburg

tel +49 40 28805731
mob +49 170 2723133
fax +49 40 42949753

xmpp://slink at jabber.int.uplex.de/

http://uplex.de/

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: OpenPGP digital signature
URL: <https://www.varnish-cache.org/lists/pipermail/varnish-commit/attachments/20171129/d6cb66db/attachment.bin>

From phk at FreeBSD.org  Wed Nov 29 09:58:11 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Wed, 29 Nov 2017 09:58:11 +0000 (UTC)
Subject: [master] 6def39b staticize STV_find() as stv_find()
Message-ID: <20171129095811.62E5893F4A@lists.varnish-cache.org>


commit 6def39b11ff251ed4c85dd118207728c7f081c88
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Nov 29 09:56:49 2017 +0000

    staticize STV_find() as stv_find()

diff --git a/bin/varnishd/cache/cache_varnishd.h b/bin/varnishd/cache/cache_varnishd.h
index 21b1e63..183be32 100644
--- a/bin/varnishd/cache/cache_varnishd.h
+++ b/bin/varnishd/cache/cache_varnishd.h
@@ -240,7 +240,6 @@ void V2D_Init(void);
 /* stevedore.c */
 void STV_open(void);
 void STV_close(void);
-const struct stevedore *STV_find(const char *);
 const struct stevedore *STV_next(void);
 int STV_BanInfoDrop(const uint8_t *ban, unsigned len);
 int STV_BanInfoNew(const uint8_t *ban, unsigned len);
diff --git a/bin/varnishd/storage/stevedore.c b/bin/varnishd/storage/stevedore.c
index 7790351..c9e80f6 100644
--- a/bin/varnishd/storage/stevedore.c
+++ b/bin/varnishd/storage/stevedore.c
@@ -179,8 +179,8 @@ STV_BanExport(const uint8_t *bans, unsigned len)
  * VRT functions for stevedores
  */
 
-const struct stevedore *
-STV_find(const char *nm)
+static const struct stevedore *
+stv_find(const char *nm)
 {
 	struct stevedore *stv;
 
@@ -194,7 +194,7 @@ int
 VRT_Stv(const char *nm)
 {
 
-	if (STV_find(nm) != NULL)
+	if (stv_find(nm) != NULL)
 		return (1);
 	return (0);
 }
@@ -211,7 +211,7 @@ VRT_STEVEDORE_string(VCL_STEVEDORE s)
 VCL_STEVEDORE
 VRT_stevedore(const char *nm)
 {
-	return (STV_find(nm));
+	return (stv_find(nm));
 }
 
 #define VRTSTVVAR(nm, vtype, ctype, dval)	\
@@ -220,7 +220,7 @@ VRT_Stv_##nm(const char *nm)			\
 {						\
 	const struct stevedore *stv;		\
 						\
-	stv = STV_find(nm);			\
+	stv = stv_find(nm);			\
 	if (stv == NULL)			\
 		return (dval);			\
 	if (stv->var_##nm == NULL)		\

From fgsch at lodoss.net  Wed Nov 29 10:42:43 2017
From: fgsch at lodoss.net (Federico Schwindt)
Date: Wed, 29 Nov 2017 10:42:43 +0000
Subject: [master] e1535c8 gc beresp.storage_hint
In-Reply-To: <CAJV_h0ZMb4E+33K7A64Pq5Txe-acy940JJHuuuxVWvGteUBn5Q@mail.gmail.com>
References: <20171128121110.D479D934A1@lists.varnish-cache.org>
 <CABoVN9AKeLrBhPknyXtPiB0xVu5E0t4+vDmx9jm3ON+XUXBq7g@mail.gmail.com>
 <0b472c2a-a794-296d-cc3b-a09956e818bf@uplex.de>
 <CAJV_h0ayxg9taKnf=xbSaxy2e5OeuZxgCZ2wGJReyP-ztJyL4Q@mail.gmail.com>
 <0a442ad7-e742-952d-fab4-d2467354f88e@uplex.de>
 <CAJV_h0Yuttr8R2u+DpUdRSzzxrFPENLpbM+5AjzNbfCkv3xwZg@mail.gmail.com>
 <CAJV_h0ZMb4E+33K7A64Pq5Txe-acy940JJHuuuxVWvGteUBn5Q@mail.gmail.com>
Message-ID: <CAJV_h0a+TdyW9MMJ+UmGr3fYmBtjaRAhEoVKBgpbKTqTPm6ocA@mail.gmail.com>

phk?

On 29 Nov 2017 9:27 am, "Nils Goroll" <nils.goroll at uplex.de> wrote:

On 28/11/17 20:26, Federico Schwindt wrote:
> My understanding when I did this was that we were going to leave these
variables
> around until after 6.0 (or whatever is the next major release).

So revert?

--

** * * UPLEX - Nils Goroll Systemoptimierung

Scheffelstra?e 32
22301 Hamburg

tel +49 40 28805731
mob +49 170 2723133
fax +49 40 42949753

xmpp://slink at jabber.int.uplex.de/

http://uplex.de/
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://www.varnish-cache.org/lists/pipermail/varnish-commit/attachments/20171129/b36f6a04/attachment-0001.html>

From phk at FreeBSD.org  Wed Nov 29 13:57:07 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Wed, 29 Nov 2017 13:57:07 +0000 (UTC)
Subject: [master] a6e6c8b Stabilize this test relative to thread scheduling.
Message-ID: <20171129135707.705CF93158@lists.varnish-cache.org>


commit a6e6c8b571912b8aa640f7858b9d6ed0bc2c9c00
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Nov 29 13:56:39 2017 +0000

    Stabilize this test relative to thread scheduling.

diff --git a/bin/varnishtest/tests/r00466.vtc b/bin/varnishtest/tests/r00466.vtc
index 813c1e7..d530b44 100644
--- a/bin/varnishtest/tests/r00466.vtc
+++ b/bin/varnishtest/tests/r00466.vtc
@@ -6,8 +6,11 @@ server s1 {
 	expect req.http.range == <undef>
 	txresp \
 		-hdr "Foobar: _barf_" \
+		-hdr "Connection: close" \
 		-body "012345\n"
 
+	accept
+
 	rxreq
 	expect req.url == "/bar"
 	expect req.http.range == "200-300"

From phk at FreeBSD.org  Wed Nov 29 14:48:07 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Wed, 29 Nov 2017 14:48:07 +0000 (UTC)
Subject: [master] 12ceffa Add small delays to improve the chances of logexpect
 working
Message-ID: <20171129144807.25E0B93489@lists.varnish-cache.org>


commit 12ceffa052e86de7a57a55d871134429f224aa86
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Nov 29 14:46:58 2017 +0000

    Add small delays to improve the chances of logexpect working

diff --git a/bin/varnishtest/tests/c00082.vtc b/bin/varnishtest/tests/c00082.vtc
index 65da5ad..d9c687e 100644
--- a/bin/varnishtest/tests/c00082.vtc
+++ b/bin/varnishtest/tests/c00082.vtc
@@ -51,14 +51,20 @@ client c1 {
 	rxresp
 	expect resp.http.Obj-Hits == 0
 
+	delay .1
+
 	txreq
 	rxresp
 	expect resp.http.Obj-Hits == 0
 
+	delay .1
+
 	txreq -hdr "Hash: always-miss"
 	rxresp
 	expect resp.http.Obj-Hits == 0
 
+	delay .1
+
 	txreq
 	rxresp
 	expect resp.http.Obj-Hits == 1

From daghf at varnish-software.com  Wed Nov 29 16:54:06 2017
From: daghf at varnish-software.com (Dag Haavi Finstad)
Date: Wed, 29 Nov 2017 16:54:06 +0000 (UTC)
Subject: [master] a9f9451 Typo
Message-ID: <20171129165406.32D079322A@lists.varnish-cache.org>


commit a9f9451c3d5affdbb0f49d153fc86ad75be987a3
Author: Dag Haavi Finstad <daghf at varnish-software.com>
Date:   Wed Nov 29 17:53:15 2017 +0100

    Typo

diff --git a/lib/libvarnishapi/vut.c b/lib/libvarnishapi/vut.c
index 2c2f54d..4245db9 100644
--- a/lib/libvarnishapi/vut.c
+++ b/lib/libvarnishapi/vut.c
@@ -367,7 +367,7 @@ VUT_Main(struct VUT *vut)
 		if (vut->vsm != NULL &&
 		    (VSM_Status(vut->vsm) & VSM_WRK_RESTARTED)) {
 			if (hascursor < 1) {
-				fprintf(stderr, "Log abandonned (vsm)\n");
+				fprintf(stderr, "Log abandoned (vsm)\n");
 				VSLQ_SetCursor(vut->vslq, NULL);
 				hascursor = 0;
 			}

From dridi.boukelmoune at gmail.com  Thu Nov 30 09:55:12 2017
From: dridi.boukelmoune at gmail.com (Dridi Boukelmoune)
Date: Thu, 30 Nov 2017 09:55:12 +0000 (UTC)
Subject: [master] 3895639 Inconsistent indentation in vsctool.py
Message-ID: <20171130095512.DD04B93E8D@lists.varnish-cache.org>


commit 38956397bf19c15679f794ad507a3e278ac4add1
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Thu Nov 30 10:49:13 2017 +0100

    Inconsistent indentation in vsctool.py

diff --git a/lib/libvcc/vsctool.py b/lib/libvcc/vsctool.py
index 0670b82..942328f 100644
--- a/lib/libvcc/vsctool.py
+++ b/lib/libvcc/vsctool.py
@@ -59,12 +59,12 @@ PARAMS = {
 
 # http://python3porting.com/problems.html#bytes-strings-and-unicode
 if sys.version_info < (3,):
-    def b(x):
-	return x
+	def b(x):
+		return x
 else:
-    import codecs
-    def b(x):
-	return codecs.latin_1_encode(x)[0]
+	import codecs
+	def b(x):
+		return codecs.latin_1_encode(x)[0]
 
 def gzip_str(s):
 	try:

From dridi.boukelmoune at gmail.com  Thu Nov 30 09:55:12 2017
From: dridi.boukelmoune at gmail.com (Dridi Boukelmoune)
Date: Thu, 30 Nov 2017 09:55:12 +0000 (UTC)
Subject: [master] ae1c0ab Scope mistake in vmodtool.py for $ABI
Message-ID: <20171130095513.04AC793E8F@lists.varnish-cache.org>


commit ae1c0ab16ac5ddc6d7aaab41431d6a7311b2ddfc
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Thu Nov 30 10:53:19 2017 +0100

    Scope mistake in vmodtool.py for $ABI
    
    Fixes #2508

diff --git a/lib/libvcc/vmodtool.py b/lib/libvcc/vmodtool.py
index 9f105f6..d271a2c 100755
--- a/lib/libvcc/vmodtool.py
+++ b/lib/libvcc/vmodtool.py
@@ -499,6 +499,7 @@ class s_module(stanza):
 
 class s_abi(stanza):
     def parse(self):
+        global strict_abi
         if self.line[1] not in ('strict', 'vrt'):
             err("Valid ABI types are 'strict' or 'vrt', got '%s'\n" %
                 self.line[1])

From hermunn at varnish-software.com  Thu Nov 30 09:59:07 2017
From: hermunn at varnish-software.com (Pål Hermunn Johansen)
Date: Thu, 30 Nov 2017 09:59:07 +0000 (UTC)
Subject: [4.1] a33bf52 Add cache_hit_grace counter
Message-ID: <20171130095907.0BC939421C@lists.varnish-cache.org>


commit a33bf527ee50f46320f6f651bcbf6e6605224da5
Author: P?l Hermunn Johansen <hermunn at varnish-software.com>
Date:   Thu Nov 30 10:46:40 2017 +0100

    Add cache_hit_grace counter
    
    The counter cache_hit_grace counts the number of grace hits. To be
    precise, it counts the number of times lookup returns an expired
    object, but vcl_hit is called and decides to return(deliver).
    
    Every time cache_hit_grace is incremented, cache_hit is also
    incremented (so this commit does not change the cache_hit counter).
    
    This is a back port of 1d62f5da43a245966faff82f3ee3e6cff46db0f2.

diff --git a/bin/varnishd/cache/cache_req_fsm.c b/bin/varnishd/cache/cache_req_fsm.c
index ca6e316..a6c4c0b 100644
--- a/bin/varnishd/cache/cache_req_fsm.c
+++ b/bin/varnishd/cache/cache_req_fsm.c
@@ -437,6 +437,8 @@ cnt_lookup(struct worker *wrk, struct req *req)
 		}
 		wrk->stats->cache_hit++;
 		req->is_hit = 1;
+		if (lr == HSH_EXP || lr == HSH_EXPBUSY)
+			wrk->stats->cache_hit_grace++;
 		req->req_step = R_STP_DELIVER;
 		return (REQ_FSM_MORE);
 	case VCL_RET_FETCH:
diff --git a/bin/varnishtest/tests/b00052.vtc b/bin/varnishtest/tests/b00052.vtc
new file mode 100644
index 0000000..23cfcf5
--- /dev/null
+++ b/bin/varnishtest/tests/b00052.vtc
@@ -0,0 +1,52 @@
+varnishtest "The cache_hit_grace counter"
+
+server s1 {
+	# normal fetch
+	rxreq
+	expect req.url == "/1"
+	txresp -hdr "Age: 1" -hdr "Cache-Control: max-age=2" -body "1"
+
+	# background fetch:
+	rxreq
+	expect req.url == "/1"
+	txresp -body "2"
+
+	# normal fetch
+	rxreq
+	expect req.url == "/2"
+	txresp
+} -start
+
+varnish v1 -vcl+backend { } -start
+
+client c1 {
+	txreq -url "/1"
+	rxresp
+	expect resp.body == "1"
+} -run
+
+delay 2
+
+# Get a grace hit, will trigger a background fetch
+
+client c2 {
+	txreq -url "/1"
+	rxresp
+	expect resp.body == "1"
+} -run
+
+delay 2
+
+client c3 {
+	txreq -url "/2"
+	rxresp
+	txreq -url "/1"
+	rxresp
+	expect resp.body == "2"
+} -run
+
+# Check that counters are correct:
+
+varnish v1 -expect cache_hit == 2
+varnish v1 -expect cache_hit_grace == 1
+varnish v1 -expect cache_miss == 2
diff --git a/include/tbl/vsc_f_main.h b/include/tbl/vsc_f_main.h
index c3b53bd..0da1989 100644
--- a/include/tbl/vsc_f_main.h
+++ b/include/tbl/vsc_f_main.h
@@ -89,6 +89,13 @@ VSC_F(cache_hit,		uint64_t, 1, 'c', 'i', info,
 	"  client without fetching it from a backend server."
 )
 
+VSC_F(cache_hit_grace,		uint64_t, 1, 'c', 'i', info,
+    "Cache grace hits",
+	"Count of cache hits with grace. A cache hit with grace is a cache"
+	" hit where the object is expired. Note that such hits are also"
+	" ncluded in the cache_hit counter."
+)
+
 VSC_F(cache_hitpass,		uint64_t, 1, 'c', 'i', info,
     "Cache hits for pass",
 	"Count of hits for pass"

From phk at FreeBSD.org  Thu Nov 30 10:23:09 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Thu, 30 Nov 2017 10:23:09 +0000 (UTC)
Subject: [master] 2061f88 Our various "make-C-readable" macros encroach on
 name-spaces reserved by various standardsbodies.
Message-ID: <20171130102309.88EC49498A@lists.varnish-cache.org>


commit 2061f887203ec454719fe760419f4562ca8876e6
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Nov 30 10:17:33 2017 +0000

    Our various "make-C-readable" macros encroach on name-spaces reserved
    by various standardsbodies.
    
    Going forward these macros will all be named 'v_[a-z_]*_' and only
    vdef.h gets to define them.
    
    Renames:
    	__match_proto__()		->	v_matchproto_()
    	__v_printflike()		->	v_printflike_()
    	__state_variable__()		->	v_statevariable_()
    	__unused			->	v_unused_
    	__attribute__((__noreturn__))	->	v_noreturn_
    
    As a side-effect of the last one, the rule that "vdef.h" be the
    first non-<...> include in .c files, possibly via a subsystem
    .h (such as vct.h) needs to be enforced harder.
    
    (autocraps "config.h" still needs to go before <...> includes)

diff --git a/bin/varnishadm/varnishadm.c b/bin/varnishadm/varnishadm.c
index 6d76761..f09f2d5 100644
--- a/bin/varnishadm/varnishadm.c
+++ b/bin/varnishadm/varnishadm.c
@@ -58,10 +58,11 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "vdef.h"
+
 #include "vapi/vsm.h"
 #include "vas.h"
 #include "vcli.h"
-#include "vdef.h"
 #include "vnum.h"
 #include "vtcp.h"
 
@@ -184,7 +185,7 @@ do_args(int sock, int argc, char * const *argv)
  * to have a global variable.
  */
 static int _line_sock;
-static void __match_proto__()
+static void v_matchproto_()
 send_line(char *l)
 {
 	if (l) {
diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index 4b27caf..189e5ef 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -672,7 +672,7 @@ void HTTP_Encode(const struct http *fm, uint8_t *, unsigned len, unsigned how);
 int HTTP_Decode(struct http *to, const uint8_t *fm);
 void http_ForceHeader(struct http *to, const char *hdr, const char *val);
 void http_PrintfHeader(struct http *to, const char *fmt, ...)
-    __v_printflike(2, 3);
+    v_printflike_(2, 3);
 void http_TimeHeader(struct http *to, const char *fmt, double now);
 void http_Proto(struct http *to);
 void http_SetHeader(struct http *to, const char *hdr);
@@ -860,10 +860,10 @@ const char *SES_Get_String_Attr(const struct sess *sp, enum sess_attr a);
 /* cache_shmlog.c */
 void VSLv(enum VSL_tag_e tag, uint32_t vxid, const char *fmt, va_list va);
 void VSL(enum VSL_tag_e tag, uint32_t vxid, const char *fmt, ...)
-    __v_printflike(3, 4);
+    v_printflike_(3, 4);
 void VSLbv(struct vsl_log *, enum VSL_tag_e tag, const char *fmt, va_list va);
 void VSLb(struct vsl_log *, enum VSL_tag_e tag, const char *fmt, ...)
-    __v_printflike(3, 4);
+    v_printflike_(3, 4);
 void VSLbt(struct vsl_log *, enum VSL_tag_e tag, txt t);
 void VSLb_ts(struct vsl_log *, const char *event, double first, double *pprev,
     double now);
@@ -927,7 +927,7 @@ void *WS_Alloc(struct ws *ws, unsigned bytes);
 void *WS_Copy(struct ws *ws, const void *str, int len);
 uintptr_t WS_Snapshot(struct ws *ws);
 int WS_Overflowed(const struct ws *ws);
-void *WS_Printf(struct ws *ws, const char *fmt, ...) __v_printflike(2, 3);
+void *WS_Printf(struct ws *ws, const char *fmt, ...) v_printflike_(2, 3);
 int WS_Inside(const struct ws *, const void *, const void *);
 void WS_Assert_Allocated(const struct ws *ws, const void *ptr, ssize_t len);
 
diff --git a/bin/varnishd/cache/cache_acceptor.c b/bin/varnishd/cache/cache_acceptor.c
index 21b8b0a..18f02ca 100644
--- a/bin/varnishd/cache/cache_acceptor.c
+++ b/bin/varnishd/cache/cache_acceptor.c
@@ -289,7 +289,7 @@ vca_pace_good(void)
  * Called from assigned worker thread
  */
 
-static void __match_proto__(task_func_t)
+static void v_matchproto_(task_func_t)
 vca_make_session(struct worker *wrk, void *arg)
 {
 	struct sess *sp;
@@ -391,7 +391,7 @@ vca_make_session(struct worker *wrk, void *arg)
  * and handle the new connection ourselves.
  */
 
-static void __match_proto__(task_func_t)
+static void v_matchproto_(task_func_t)
 vca_accept_task(struct worker *wrk, void *arg)
 {
 	struct wrk_accept wa;
@@ -518,7 +518,7 @@ VCA_DestroyPool(struct pool *pp)
 
 /*--------------------------------------------------------------------*/
 
-static void * __match_proto__()
+static void * v_matchproto_()
 vca_acct(void *arg)
 {
 	struct listen_sock *ls;
@@ -583,7 +583,7 @@ vca_acct(void *arg)
 
 /*--------------------------------------------------------------------*/
 
-static void __match_proto__(cli_func_t)
+static void v_matchproto_(cli_func_t)
 ccf_start(struct cli *cli, const char * const *av, void *priv)
 {
 
@@ -596,7 +596,7 @@ ccf_start(struct cli *cli, const char * const *av, void *priv)
 
 /*--------------------------------------------------------------------*/
 
-static void __match_proto__(cli_func_t)
+static void v_matchproto_(cli_func_t)
 ccf_listen_address(struct cli *cli, const char * const *av, void *priv)
 {
 	struct listen_sock *ls;
diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c
index d05cb80..d1e5525 100644
--- a/bin/varnishd/cache/cache_backend.c
+++ b/bin/varnishd/cache/cache_backend.c
@@ -150,7 +150,7 @@ vbe_dir_getfd(struct worker *wrk, struct backend *bp, struct busyobj *bo,
 	return (vtp);
 }
 
-static unsigned __match_proto__(vdi_healthy_f)
+static unsigned v_matchproto_(vdi_healthy_f)
 vbe_dir_healthy(const struct director *d, const struct busyobj *bo,
     double *changed)
 {
@@ -162,7 +162,7 @@ vbe_dir_healthy(const struct director *d, const struct busyobj *bo,
 	return (VDI_Healthy(be->director, changed));
 }
 
-static void __match_proto__(vdi_finish_f)
+static void v_matchproto_(vdi_finish_f)
 vbe_dir_finish(const struct director *d, struct worker *wrk,
     struct busyobj *bo)
 {
@@ -203,7 +203,7 @@ vbe_dir_finish(const struct director *d, struct worker *wrk,
 	bo->htc = NULL;
 }
 
-static int __match_proto__(vdi_gethdrs_f)
+static int v_matchproto_(vdi_gethdrs_f)
 vbe_dir_gethdrs(const struct director *d, struct worker *wrk,
     struct busyobj *bo)
 {
@@ -272,7 +272,7 @@ vbe_dir_gethdrs(const struct director *d, struct worker *wrk,
 	return (-1);
 }
 
-static const struct suckaddr * __match_proto__(vdi_getip_f)
+static const struct suckaddr * v_matchproto_(vdi_getip_f)
 vbe_dir_getip(const struct director *d, struct worker *wrk,
     struct busyobj *bo)
 {
@@ -365,7 +365,7 @@ vbe_dir_event(const struct director *d, enum vcl_event_e ev)
 
 /*---------------------------------------------------------------------*/
 
-static void __match_proto__(vdi_destroy_f)
+static void v_matchproto_(vdi_destroy_f)
 vbe_destroy(const struct director *d)
 {
 	struct backend *be;
diff --git a/bin/varnishd/cache/cache_backend_probe.c b/bin/varnishd/cache/cache_backend_probe.c
index 26e14b1..b362cec 100644
--- a/bin/varnishd/cache/cache_backend_probe.c
+++ b/bin/varnishd/cache/cache_backend_probe.c
@@ -380,7 +380,7 @@ vbp_poke(struct vbp_target *vt)
 /*--------------------------------------------------------------------
  */
 
-static void __match_proto__(task_func_t)
+static void v_matchproto_(task_func_t)
 vbp_task(struct worker *wrk, void *priv)
 {
 	struct vbp_target *vt;
@@ -415,7 +415,7 @@ vbp_task(struct worker *wrk, void *priv)
 /*--------------------------------------------------------------------
  */
 
-static void * __match_proto__()
+static void * v_matchproto_()
 vbp_thread(struct worker *wrk, void *priv)
 {
 	double now, nxt;
@@ -653,7 +653,7 @@ VBP_Remove(struct backend *be)
 
 /*-------------------------------------------------------------------*/
 
-static int __match_proto__(binheap_cmp_t)
+static int v_matchproto_(binheap_cmp_t)
 vbp_cmp(void *priv, const void *a, const void *b)
 {
 	const struct vbp_target *aa, *bb;
@@ -668,7 +668,7 @@ vbp_cmp(void *priv, const void *a, const void *b)
 	return (aa->due < bb->due);
 }
 
-static void __match_proto__(binheap_update_t)
+static void v_matchproto_(binheap_update_t)
 vbp_update(void *priv, void *p, unsigned u)
 {
 	struct vbp_target *vt;
diff --git a/bin/varnishd/cache/cache_ban.c b/bin/varnishd/cache/cache_ban.c
index e2b16ee..0393dee 100644
--- a/bin/varnishd/cache/cache_ban.c
+++ b/bin/varnishd/cache/cache_ban.c
@@ -618,7 +618,7 @@ BAN_CheckObject(struct worker *wrk, struct objcore *oc, struct req *req)
  * CLI functions to add bans
  */
 
-static void __match_proto__(cli_func_t)
+static void v_matchproto_(cli_func_t)
 ccf_ban(struct cli *cli, const char * const *av, void *priv)
 {
 	int narg, i;
@@ -707,7 +707,7 @@ ban_render(struct cli *cli, const uint8_t *bs)
 	}
 }
 
-static void __match_proto__(cli_func_t)
+static void v_matchproto_(cli_func_t)
 ccf_ban_list(struct cli *cli, const char * const *av, void *priv)
 {
 	struct ban *b, *bl;
diff --git a/bin/varnishd/cache/cache_ban_lurker.c b/bin/varnishd/cache/cache_ban_lurker.c
index ba3447e..974cf9c 100644
--- a/bin/varnishd/cache/cache_ban_lurker.c
+++ b/bin/varnishd/cache/cache_ban_lurker.c
@@ -364,7 +364,7 @@ ban_lurker_work(struct worker *wrk, struct vsl_log *vsl)
 	return (dt);
 }
 
-void * __match_proto__(bgthread_t)
+void * v_matchproto_(bgthread_t)
 ban_lurker(struct worker *wrk, void *priv)
 {
 	struct vsl_log vsl;
diff --git a/bin/varnishd/cache/cache_deliver_proc.c b/bin/varnishd/cache/cache_deliver_proc.c
index 2221c89..20439b1 100644
--- a/bin/varnishd/cache/cache_deliver_proc.c
+++ b/bin/varnishd/cache/cache_deliver_proc.c
@@ -123,7 +123,7 @@ VDP_close(struct req *req)
 
 /*--------------------------------------------------------------------*/
 
-static int __match_proto__(objiterate_f)
+static int v_matchproto_(objiterate_f)
 vdp_objiterator(void *priv, int flush, const void *ptr, ssize_t len)
 {
 	return (VDP_bytes(priv, flush ? VDP_FLUSH : VDP_NULL, ptr, len));
diff --git a/bin/varnishd/cache/cache_director.c b/bin/varnishd/cache/cache_director.c
index f47ac1a..30ae727 100644
--- a/bin/varnishd/cache/cache_director.c
+++ b/bin/varnishd/cache/cache_director.c
@@ -283,7 +283,7 @@ VDI_Healthy(const struct director *d, double *changed)
 
 /*---------------------------------------------------------------------*/
 
-static int __match_proto__(vcl_be_func)
+static int v_matchproto_(vcl_be_func)
 do_list(struct cli *cli, struct director *d, void *priv)
 {
 	int *probes;
@@ -317,7 +317,7 @@ do_list(struct cli *cli, struct director *d, void *priv)
 	return (0);
 }
 
-static void __match_proto__(cli_func_t)
+static void v_matchproto_(cli_func_t)
 cli_backend_list(struct cli *cli, const char * const *av, void *priv)
 {
 	int probes = 0;
@@ -343,7 +343,7 @@ cli_backend_list(struct cli *cli, const char * const *av, void *priv)
 
 /*---------------------------------------------------------------------*/
 
-static int __match_proto__(vcl_be_func)
+static int v_matchproto_(vcl_be_func)
 do_set_health(struct cli *cli, struct director *d, void *priv)
 {
 	unsigned prev;
@@ -362,7 +362,7 @@ do_set_health(struct cli *cli, struct director *d, void *priv)
 	return (0);
 }
 
-static void __match_proto__()
+static void v_matchproto_()
 cli_backend_set_health(struct cli *cli, const char * const *av, void *priv)
 {
 	const struct vdi_ahealth *ah;
diff --git a/bin/varnishd/cache/cache_esi_deliver.c b/bin/varnishd/cache/cache_esi_deliver.c
index 0d3e451..3af6985 100644
--- a/bin/varnishd/cache/cache_esi_deliver.c
+++ b/bin/varnishd/cache/cache_esi_deliver.c
@@ -77,7 +77,7 @@ static const struct transport VED_transport = {
 
 /*--------------------------------------------------------------------*/
 
-static void __match_proto__(vtr_reembark_f)
+static void v_matchproto_(vtr_reembark_f)
 ved_reembark(struct worker *wrk, struct req *req)
 {
 	struct ecx *ecx;
@@ -249,7 +249,7 @@ ved_decode_len(struct req *req, const uint8_t **pp)
 /*---------------------------------------------------------------------
  */
 
-static int __match_proto__(vdp_bytes)
+static int v_matchproto_(vdp_bytes)
 ved_vdp(struct req *req, enum vdp_action act, void **priv,
     const void *ptr, ssize_t len)
 {
@@ -466,7 +466,7 @@ ved_bytes(struct req *req, struct req *preq, enum vdp_action act,
  * the stream with a bit more overhead.
  */
 
-static int __match_proto__(vdp_bytes)
+static int v_matchproto_(vdp_bytes)
 ved_pretend_gzip(struct req *req, enum vdp_action act, void **priv,
     const void *pv, ssize_t l)
 {
@@ -767,7 +767,7 @@ ved_stripgzip(struct req *req, const struct boc *boc)
 
 /*--------------------------------------------------------------------*/
 
-static int __match_proto__(vdp_bytes)
+static int v_matchproto_(vdp_bytes)
 ved_vdp_bytes(struct req *req, enum vdp_action act, void **priv,
     const void *ptr, ssize_t len)
 {
@@ -791,7 +791,7 @@ static const struct vdp ved_ved = {
 
 /*--------------------------------------------------------------------*/
 
-static void __match_proto__(vtr_deliver_f)
+static void v_matchproto_(vtr_deliver_f)
 ved_deliver(struct req *req, struct boc *boc, int wantbody)
 {
 	int i;
diff --git a/bin/varnishd/cache/cache_esi_fetch.c b/bin/varnishd/cache/cache_esi_fetch.c
index 47ea1c8..906c2ba 100644
--- a/bin/varnishd/cache/cache_esi_fetch.c
+++ b/bin/varnishd/cache/cache_esi_fetch.c
@@ -145,7 +145,7 @@ vfp_esi_end(struct vfp_ctx *vc, struct vef_priv *vef,
 	return (retval);
 }
 
-static enum vfp_status __match_proto__(vfp_init_f)
+static enum vfp_status v_matchproto_(vfp_init_f)
 vfp_esi_gzip_init(struct vfp_ctx *vc, struct vfp_entry *vfe)
 {
 	struct vef_priv *vef;
@@ -176,7 +176,7 @@ vfp_esi_gzip_init(struct vfp_ctx *vc, struct vfp_entry *vfe)
 	return (VFP_OK);
 }
 
-static enum vfp_status __match_proto__(vfp_pull_f)
+static enum vfp_status v_matchproto_(vfp_pull_f)
 vfp_esi_gzip_pull(struct vfp_ctx *vc, struct vfp_entry *vfe, void *p,
    ssize_t *lp)
 {
@@ -219,7 +219,7 @@ vfp_esi_gzip_pull(struct vfp_ctx *vc, struct vfp_entry *vfe, void *p,
 	return (vp);
 }
 
-static enum vfp_status __match_proto__(vfp_init_f)
+static enum vfp_status v_matchproto_(vfp_init_f)
 vfp_esi_init(struct vfp_ctx *vc, struct vfp_entry *vfe)
 {
 	struct vef_priv *vef;
@@ -234,7 +234,7 @@ vfp_esi_init(struct vfp_ctx *vc, struct vfp_entry *vfe)
 	return (VFP_OK);
 }
 
-static enum vfp_status __match_proto__(vfp_pull_f)
+static enum vfp_status v_matchproto_(vfp_pull_f)
 vfp_esi_pull(struct vfp_ctx *vc, struct vfp_entry *vfe, void *p, ssize_t *lp)
 {
 	enum vfp_status vp;
@@ -261,7 +261,7 @@ vfp_esi_pull(struct vfp_ctx *vc, struct vfp_entry *vfe, void *p, ssize_t *lp)
 	return (vp);
 }
 
-static void __match_proto__(vfp_fini_f)
+static void v_matchproto_(vfp_fini_f)
 vfp_esi_fini(struct vfp_ctx *vc, struct vfp_entry *vfe)
 {
 	CHECK_OBJ_NOTNULL(vc, VFP_CTX_MAGIC);
diff --git a/bin/varnishd/cache/cache_esi_parse.c b/bin/varnishd/cache/cache_esi_parse.c
index 0cef4dd..1fd6e53 100644
--- a/bin/varnishd/cache/cache_esi_parse.c
+++ b/bin/varnishd/cache/cache_esi_parse.c
@@ -395,7 +395,7 @@ vep_mark_pending(struct vep_state *vep, const char *p)
 /*---------------------------------------------------------------------
  */
 
-static void __match_proto__()
+static void v_matchproto_()
 vep_do_comment(struct vep_state *vep, enum dowhat what)
 {
 	Debug("DO_COMMENT(%d)\n", what);
@@ -407,7 +407,7 @@ vep_do_comment(struct vep_state *vep, enum dowhat what)
 /*---------------------------------------------------------------------
  */
 
-static void __match_proto__()
+static void v_matchproto_()
 vep_do_remove(struct vep_state *vep, enum dowhat what)
 {
 	Debug("DO_REMOVE(%d, end %d empty %d remove %d)\n",
@@ -426,7 +426,7 @@ vep_do_remove(struct vep_state *vep, enum dowhat what)
 /*---------------------------------------------------------------------
  */
 
-static void __match_proto__()
+static void v_matchproto_()
 vep_do_include(struct vep_state *vep, enum dowhat what)
 {
 	const char *p, *q, *h;
@@ -1001,7 +1001,7 @@ VEP_Parse(struct vep_state *vep, const char *p, size_t l)
 /*---------------------------------------------------------------------
  */
 
-static ssize_t __match_proto__(vep_callback_t)
+static ssize_t v_matchproto_(vep_callback_t)
 vep_default_cb(struct vfp_ctx *vc, void *priv, ssize_t l, enum vgz_flag flg)
 {
 	ssize_t *s;
diff --git a/bin/varnishd/cache/cache_expire.c b/bin/varnishd/cache/cache_expire.c
index 7bbd123..3b6f097 100644
--- a/bin/varnishd/cache/cache_expire.c
+++ b/bin/varnishd/cache/cache_expire.c
@@ -279,7 +279,7 @@ exp_expire(struct exp_priv *ep, double now)
  * object expires, accounting also for graceability, it is killed.
  */
 
-static int __match_proto__(binheap_cmp_t)
+static int v_matchproto_(binheap_cmp_t)
 object_cmp(void *priv, const void *a, const void *b)
 {
 	const struct objcore *aa, *bb;
@@ -290,7 +290,7 @@ object_cmp(void *priv, const void *a, const void *b)
 	return (aa->timer_when < bb->timer_when);
 }
 
-static void __match_proto__(binheap_update_t)
+static void v_matchproto_(binheap_update_t)
 object_update(void *priv, void *p, unsigned u)
 {
 	struct objcore *oc;
@@ -300,7 +300,7 @@ object_update(void *priv, void *p, unsigned u)
 	oc->timer_idx = u;
 }
 
-static void * __match_proto__(bgthread_t)
+static void * v_matchproto_(bgthread_t)
 exp_thread(struct worker *wrk, void *priv)
 {
 	struct objcore *oc;
diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c
index cf3389a..e08f6fb 100644
--- a/bin/varnishd/cache/cache_fetch.c
+++ b/bin/varnishd/cache/cache_fetch.c
@@ -869,7 +869,7 @@ vbf_stp_done(void)
 	NEEDLESS(return(F_STP_DONE));
 }
 
-static void __match_proto__(task_func_t)
+static void v_matchproto_(task_func_t)
 vbf_fetch_thread(struct worker *wrk, void *priv)
 {
 	struct busyobj *bo;
diff --git a/bin/varnishd/cache/cache_fetch_proc.c b/bin/varnishd/cache/cache_fetch_proc.c
index 84b3abb..1413f1b 100644
--- a/bin/varnishd/cache/cache_fetch_proc.c
+++ b/bin/varnishd/cache/cache_fetch_proc.c
@@ -224,7 +224,7 @@ VFP_Push(struct vfp_ctx *vc, const struct vfp *vfp)
  * Debugging aids
  */
 
-static void __match_proto__(cli_func_t)
+static void v_matchproto_(cli_func_t)
 debug_fragfetch(struct cli *cli, const char * const *av, void *priv)
 {
 	(void)priv;
diff --git a/bin/varnishd/cache/cache_filter.h b/bin/varnishd/cache/cache_filter.h
index f6a1ffa..4745836 100644
--- a/bin/varnishd/cache/cache_filter.h
+++ b/bin/varnishd/cache/cache_filter.h
@@ -86,7 +86,7 @@ struct vfp_ctx {
 
 enum vfp_status VFP_Suck(struct vfp_ctx *, void *p, ssize_t *lp);
 enum vfp_status VFP_Error(struct vfp_ctx *, const char *fmt, ...)
-    __v_printflike(2, 3);
+    v_printflike_(2, 3);
 
 /* Deliver processors ------------------------------------------------*/
 
diff --git a/bin/varnishd/cache/cache_gzip.c b/bin/varnishd/cache/cache_gzip.c
index 258db64..aee17d3 100644
--- a/bin/varnishd/cache/cache_gzip.c
+++ b/bin/varnishd/cache/cache_gzip.c
@@ -284,7 +284,7 @@ VGZ_Gzip(struct vgz *vg, const void **pptr, ssize_t *plen, enum vgz_flag flags)
  * VDP for gunzip'ing
  */
 
-static int __match_proto__(vdp_bytes)
+static int v_matchproto_(vdp_bytes)
 vdp_gunzip(struct req *req, enum vdp_action act, void **priv,
     const void *ptr, ssize_t len)
 {
@@ -437,7 +437,7 @@ VGZ_Destroy(struct vgz **vgp)
 
 /*--------------------------------------------------------------------*/
 
-static enum vfp_status __match_proto__(vfp_init_f)
+static enum vfp_status v_matchproto_(vfp_init_f)
 vfp_gzip_init(struct vfp_ctx *vc, struct vfp_entry *vfe)
 {
 	struct vgz *vg;
@@ -486,7 +486,7 @@ vfp_gzip_init(struct vfp_ctx *vc, struct vfp_entry *vfe)
  * A VFP for gunzip'ing an object as we receive it from the backend
  */
 
-static enum vfp_status __match_proto__(vfp_pull_f)
+static enum vfp_status v_matchproto_(vfp_pull_f)
 vfp_gunzip_pull(struct vfp_ctx *vc, struct vfp_entry *vfe, void *p,
     ssize_t *lp)
 {
@@ -540,7 +540,7 @@ vfp_gunzip_pull(struct vfp_ctx *vc, struct vfp_entry *vfe, void *p,
  * A VFP for gzip'ing an object as we receive it from the backend
  */
 
-static enum vfp_status __match_proto__(vfp_pull_f)
+static enum vfp_status v_matchproto_(vfp_pull_f)
 vfp_gzip_pull(struct vfp_ctx *vc, struct vfp_entry *vfe, void *p,
     ssize_t *lp)
 {
@@ -596,7 +596,7 @@ vfp_gzip_pull(struct vfp_ctx *vc, struct vfp_entry *vfe, void *p,
  * collecting the magic bits while we're at it.
  */
 
-static enum vfp_status __match_proto__(vfp_pull_f)
+static enum vfp_status v_matchproto_(vfp_pull_f)
 vfp_testgunzip_pull(struct vfp_ctx *vc, struct vfp_entry *vfe, void *p,
     ssize_t *lp)
 {
@@ -638,7 +638,7 @@ vfp_testgunzip_pull(struct vfp_ctx *vc, struct vfp_entry *vfe, void *p,
 
 /*--------------------------------------------------------------------*/
 
-static void __match_proto__(vfp_fini_f)
+static void v_matchproto_(vfp_fini_f)
 vfp_gzip_fini(struct vfp_ctx *vc, struct vfp_entry *vfe)
 {
 	struct vgz *vg;
diff --git a/bin/varnishd/cache/cache_lck.c b/bin/varnishd/cache/cache_lck.c
index d9bd7ff..ee3e864 100644
--- a/bin/varnishd/cache/cache_lck.c
+++ b/bin/varnishd/cache/cache_lck.c
@@ -104,7 +104,7 @@ Lck_Witness_Unlock(const struct ilck *il)
 
 /*--------------------------------------------------------------------*/
 
-void __match_proto__()
+void v_matchproto_()
 Lck__Lock(struct lock *lck, const char *p, int l)
 {
 	struct ilck *ilck;
@@ -119,7 +119,7 @@ Lck__Lock(struct lock *lck, const char *p, int l)
 	ilck->held = 1;
 }
 
-void __match_proto__()
+void v_matchproto_()
 Lck__Unlock(struct lock *lck, const char *p, int l)
 {
 	struct ilck *ilck;
@@ -147,7 +147,7 @@ Lck__Unlock(struct lock *lck, const char *p, int l)
 		Lck_Witness_Unlock(ilck);
 }
 
-int __match_proto__()
+int v_matchproto_()
 Lck__Trylock(struct lock *lck, const char *p, int l)
 {
 	struct ilck *ilck;
@@ -186,7 +186,7 @@ Lck__Owned(const struct lock *lck)
 	return (pthread_equal(ilck->owner, pthread_self()));
 }
 
-int __match_proto__()
+int v_matchproto_()
 Lck_CondWait(pthread_cond_t *cond, struct lock *lck, double when)
 {
 	struct ilck *ilck;
diff --git a/bin/varnishd/cache/cache_main.c b/bin/varnishd/cache/cache_main.c
index 799cda3..0f92414 100644
--- a/bin/varnishd/cache/cache_main.c
+++ b/bin/varnishd/cache/cache_main.c
@@ -180,7 +180,7 @@ VXID_Get(struct worker *wrk, uint32_t mask)
  * Dumb down the VXID allocation to make it predictable for
  * varnishtest cases
  */
-static void __match_proto__(cli_func_t)
+static void v_matchproto_(cli_func_t)
 cli_debug_xid(struct cli *cli, const char * const *av, void *priv)
 {
 	(void)priv;
@@ -195,7 +195,7 @@ cli_debug_xid(struct cli *cli, const char * const *av, void *priv)
  * Default to seed=1, this is the only seed value POSIXl guarantees will
  * result in a reproducible random number sequence.
  */
-static void __match_proto__(cli_func_t)
+static void v_matchproto_(cli_func_t)
 cli_debug_srandom(struct cli *cli, const char * const *av, void *priv)
 {
 	unsigned seed = 1;
@@ -231,7 +231,7 @@ child_malloc_fail(void *p, const char *s)
  * signal handler for child process
  */
 
-static void __match_proto__()
+static void v_matchproto_()
 child_signal_handler(int s, siginfo_t *si, void *c)
 {
 	char buf[1024];
diff --git a/bin/varnishd/cache/cache_mempool.c b/bin/varnishd/cache/cache_mempool.c
index 6c150bd..9017532 100644
--- a/bin/varnishd/cache/cache_mempool.c
+++ b/bin/varnishd/cache/cache_mempool.c
@@ -98,7 +98,7 @@ mpl_guard(void *priv)
 {
 	struct mempool *mpl;
 	struct memitem *mi = NULL;
-	double __state_variable__(mpl_slp);
+	double v_statevariable_(mpl_slp);
 	double last = 0;
 
 	CAST_OBJ_NOTNULL(mpl, priv, MEMPOOL_MAGIC);
diff --git a/bin/varnishd/cache/cache_panic.c b/bin/varnishd/cache/cache_panic.c
index 75faef9..b13ae48 100644
--- a/bin/varnishd/cache/cache_panic.c
+++ b/bin/varnishd/cache/cache_panic.c
@@ -665,7 +665,7 @@ pan_ic(const char *func, const char *file, int line, const char *cond,
 
 /*--------------------------------------------------------------------*/
 
-static void __match_proto__(cli_func_t)
+static void v_matchproto_(cli_func_t)
 ccf_panic(struct cli *cli, const char * const *av, void *priv)
 {
 
diff --git a/bin/varnishd/cache/cache_pool.c b/bin/varnishd/cache/cache_pool.c
index 3e7a670..f2bcc23 100644
--- a/bin/varnishd/cache/cache_pool.c
+++ b/bin/varnishd/cache/cache_pool.c
@@ -118,7 +118,7 @@ Pool_PurgeStat(unsigned nobj)
  * Special function to summ stats
  */
 
-void __match_proto__(task_func_t)
+void v_matchproto_(task_func_t)
 pool_stat_summ(struct worker *wrk, void *priv)
 {
 	struct VSC_main *src;
@@ -178,7 +178,7 @@ pool_mkpool(unsigned pool_no)
  * NB: be maintained for params which require action.
  */
 
-static void * __match_proto__()
+static void * v_matchproto_()
 pool_poolherder(void *priv)
 {
 	unsigned nwq;
diff --git a/bin/varnishd/cache/cache_range.c b/bin/varnishd/cache/cache_range.c
index 7ee0b11..acd7034 100644
--- a/bin/varnishd/cache/cache_range.c
+++ b/bin/varnishd/cache/cache_range.c
@@ -44,7 +44,7 @@ struct vrg_priv {
 	ssize_t			range_off;
 };
 
-static int __match_proto__(vdp_bytes)
+static int v_matchproto_(vdp_bytes)
 vrg_range_bytes(struct req *req, enum vdp_action act, void **priv,
     const void *ptr, ssize_t len)
 {
diff --git a/bin/varnishd/cache/cache_req.c b/bin/varnishd/cache/cache_req.c
index 0688adf..25c4ce1 100644
--- a/bin/varnishd/cache/cache_req.c
+++ b/bin/varnishd/cache/cache_req.c
@@ -231,7 +231,7 @@ Req_Cleanup(struct sess *sp, struct worker *wrk, struct req *req)
 /*----------------------------------------------------------------------
  */
 
-void __match_proto__(vtr_req_fail_f)
+void v_matchproto_(vtr_req_fail_f)
 Req_Fail(struct req *req, enum sess_close reason)
 {
 	CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
diff --git a/bin/varnishd/cache/cache_req_body.c b/bin/varnishd/cache/cache_req_body.c
index b7de15a..d170bbc 100644
--- a/bin/varnishd/cache/cache_req_body.c
+++ b/bin/varnishd/cache/cache_req_body.c
@@ -225,7 +225,7 @@ VRB_Iterate(struct req *req, objiterate_f *func, void *priv)
  * just iterate it into oblivion.
  */
 
-static int __match_proto__(objiterate_f)
+static int v_matchproto_(objiterate_f)
 httpq_req_body_discard(void *priv, int flush, const void *ptr, ssize_t len)
 {
 
diff --git a/bin/varnishd/cache/cache_session.c b/bin/varnishd/cache/cache_session.c
index 0ddd0f5..3e96b78 100644
--- a/bin/varnishd/cache/cache_session.c
+++ b/bin/varnishd/cache/cache_session.c
@@ -382,7 +382,7 @@ SES_Reschedule_Req(struct req *req, enum task_prio prio)
  * Handle a session (from waiter)
  */
 
-static void __match_proto__(waiter_handle_f)
+static void v_matchproto_(waiter_handle_f)
 ses_handle(struct waited *wp, enum wait_event ev, double now)
 {
 	struct sess *sp;
diff --git a/bin/varnishd/cache/cache_tcp_pool.c b/bin/varnishd/cache/cache_tcp_pool.c
index 18adad3..feaeed1 100644
--- a/bin/varnishd/cache/cache_tcp_pool.c
+++ b/bin/varnishd/cache/cache_tcp_pool.c
@@ -72,7 +72,7 @@ static VTAILQ_HEAD(, tcp_pool)	tcp_pools = VTAILQ_HEAD_INITIALIZER(tcp_pools);
  * Waiter-handler
  */
 
-static void  __match_proto__(waiter_handle_f)
+static void  v_matchproto_(waiter_handle_f)
 tcp_handle(struct waited *w, enum wait_event ev, double now)
 {
 	struct vtp *vtp;
diff --git a/bin/varnishd/cache/cache_vcl.c b/bin/varnishd/cache/cache_vcl.c
index 26043ea..d605dcf 100644
--- a/bin/varnishd/cache/cache_vcl.c
+++ b/bin/varnishd/cache/cache_vcl.c
@@ -899,7 +899,7 @@ VCL_Poll(void)
 
 /*--------------------------------------------------------------------*/
 
-static void __match_proto__(cli_func_t)
+static void v_matchproto_(cli_func_t)
 vcl_cli_list(struct cli *cli, const char * const *av, void *priv)
 {
 	struct vcl *vcl;
@@ -932,7 +932,7 @@ vcl_cli_list(struct cli *cli, const char * const *av, void *priv)
 	}
 }
 
-static void __match_proto__(cli_func_t)
+static void v_matchproto_(cli_func_t)
 vcl_cli_load(struct cli *cli, const char * const *av, void *priv)
 {
 	struct vrt_ctx *ctx;
@@ -944,7 +944,7 @@ vcl_cli_load(struct cli *cli, const char * const *av, void *priv)
 	vcl_rel_ctx(&ctx);
 }
 
-static void __match_proto__(cli_func_t)
+static void v_matchproto_(cli_func_t)
 vcl_cli_state(struct cli *cli, const char * const *av, void *priv)
 {
 	struct vrt_ctx *ctx;
@@ -969,7 +969,7 @@ vcl_cli_state(struct cli *cli, const char * const *av, void *priv)
 	vcl_rel_ctx(&ctx);
 }
 
-static void __match_proto__(cli_func_t)
+static void v_matchproto_(cli_func_t)
 vcl_cli_discard(struct cli *cli, const char * const *av, void *priv)
 {
 	struct vcl *vcl;
@@ -1002,7 +1002,7 @@ vcl_cli_discard(struct cli *cli, const char * const *av, void *priv)
 	}
 }
 
-static void __match_proto__(cli_func_t)
+static void v_matchproto_(cli_func_t)
 vcl_cli_label(struct cli *cli, const char * const *av, void *priv)
 {
 	struct vcl *lbl;
@@ -1029,7 +1029,7 @@ vcl_cli_label(struct cli *cli, const char * const *av, void *priv)
 	vcl->nlabels++;
 }
 
-static void __match_proto__(cli_func_t)
+static void v_matchproto_(cli_func_t)
 vcl_cli_use(struct cli *cli, const char * const *av, void *priv)
 {
 	struct vcl *vcl;
@@ -1045,7 +1045,7 @@ vcl_cli_use(struct cli *cli, const char * const *av, void *priv)
 	Lck_Unlock(&vcl_mtx);
 }
 
-static void __match_proto__(cli_func_t)
+static void v_matchproto_(cli_func_t)
 vcl_cli_show(struct cli *cli, const char * const *av, void *priv)
 {
 	struct vcl *vcl;
diff --git a/bin/varnishd/cache/cache_vrt.c b/bin/varnishd/cache/cache_vrt.c
index 0d3b19e..1a95db3 100644
--- a/bin/varnishd/cache/cache_vrt.c
+++ b/bin/varnishd/cache/cache_vrt.c
@@ -389,7 +389,7 @@ VRT_TIME_string(VRT_CTX, double t)
 	return (p);
 }
 
-const char * __match_proto__()
+const char * v_matchproto_()
 VRT_BACKEND_string(VCL_BACKEND d)
 {
 	if (d == NULL)
diff --git a/bin/varnishd/cache/cache_vrt_vmod.c b/bin/varnishd/cache/cache_vrt_vmod.c
index f1c7a80..658e3ba 100644
--- a/bin/varnishd/cache/cache_vrt_vmod.c
+++ b/bin/varnishd/cache/cache_vrt_vmod.c
@@ -201,7 +201,7 @@ VMOD_Panic(struct vsb *vsb)
 
 /*---------------------------------------------------------------------*/
 
-static void __match_proto__(cli_func_t)
+static void v_matchproto_(cli_func_t)
 ccf_debug_vmod(struct cli *cli, const char * const *av, void *priv)
 {
 	struct vmod *v;
diff --git a/bin/varnishd/cache/cache_wrk.c b/bin/varnishd/cache/cache_wrk.c
index af65011..2a9c75d 100644
--- a/bin/varnishd/cache/cache_wrk.c
+++ b/bin/varnishd/cache/cache_wrk.c
@@ -281,7 +281,7 @@ Pool_Task(struct pool *pp, struct pool_task *task, enum task_prio prio)
  * Empty function used as a pointer value for the thread exit condition.
  */
 
-static void __match_proto__(task_func_t)
+static void v_matchproto_(task_func_t)
 pool_kiss_of_death(struct worker *wrk, void *priv)
 {
 	(void)wrk;
diff --git a/bin/varnishd/hash/hash_classic.c b/bin/varnishd/hash/hash_classic.c
index c9e0d7f..33704e4 100644
--- a/bin/varnishd/hash/hash_classic.c
+++ b/bin/varnishd/hash/hash_classic.c
@@ -58,7 +58,7 @@ static struct hcl_hd		*hcl_head;
  * The ->init method allows the management process to pass arguments
  */
 
-static void __match_proto__(hash_init_f)
+static void v_matchproto_(hash_init_f)
 hcl_init(int ac, char * const *av)
 {
 	int i;
@@ -89,7 +89,7 @@ hcl_init(int ac, char * const *av)
  * initialization to happen before the first lookup.
  */
 
-static void __match_proto__(hash_start_f)
+static void v_matchproto_(hash_start_f)
 hcl_start(void)
 {
 	unsigned u;
@@ -114,7 +114,7 @@ hcl_start(void)
  * rare and collisions even rarer.
  */
 
-static struct objhead * __match_proto__(hash_lookup_f)
+static struct objhead * v_matchproto_(hash_lookup_f)
 hcl_lookup(struct worker *wrk, const void *digest, struct objhead **noh)
 {
 	struct objhead *oh;
@@ -171,7 +171,7 @@ hcl_lookup(struct worker *wrk, const void *digest, struct objhead **noh)
  * Dereference and if no references are left, free.
  */
 
-static int __match_proto__(hash_deref_f)
+static int v_matchproto_(hash_deref_f)
 hcl_deref(struct objhead *oh)
 {
 	struct hcl_hd *hp;
diff --git a/bin/varnishd/hash/hash_critbit.c b/bin/varnishd/hash/hash_critbit.c
index 417673c..c673595 100644
--- a/bin/varnishd/hash/hash_critbit.c
+++ b/bin/varnishd/hash/hash_critbit.c
@@ -305,7 +305,7 @@ hcb_delete(struct hcb_root *r, const struct objhead *oh)
 
 /*--------------------------------------------------------------------*/
 
-static void * __match_proto__(bgthread_t)
+static void * v_matchproto_(bgthread_t)
 hcb_cleaner(struct worker *wrk, void *priv)
 {
 	struct hcb_y *y, *y2;
@@ -333,7 +333,7 @@ hcb_cleaner(struct worker *wrk, void *priv)
 
 /*--------------------------------------------------------------------*/
 
-static void __match_proto__(hash_start_f)
+static void v_matchproto_(hash_start_f)
 hcb_start(void)
 {
 	struct objhead *oh = NULL;
@@ -346,7 +346,7 @@ hcb_start(void)
 	hcb_build_bittbl();
 }
 
-static int __match_proto__(hash_deref_f)
+static int v_matchproto_(hash_deref_f)
 hcb_deref(struct objhead *oh)
 {
 
@@ -367,7 +367,7 @@ hcb_deref(struct objhead *oh)
 	return (1);
 }
 
-static struct objhead * __match_proto__(hash_lookup_f)
+static struct objhead * v_matchproto_(hash_lookup_f)
 hcb_lookup(struct worker *wrk, const void *digest, struct objhead **noh)
 {
 	struct objhead *oh;
@@ -431,7 +431,7 @@ hcb_lookup(struct worker *wrk, const void *digest, struct objhead **noh)
 	}
 }
 
-static void __match_proto__(hash_prep_f)
+static void v_matchproto_(hash_prep_f)
 hcb_prep(struct worker *wrk)
 {
 	struct hcb_y *y;
diff --git a/bin/varnishd/hash/hash_simple_list.c b/bin/varnishd/hash/hash_simple_list.c
index 188c5ce..e2726ea 100644
--- a/bin/varnishd/hash/hash_simple_list.c
+++ b/bin/varnishd/hash/hash_simple_list.c
@@ -48,7 +48,7 @@ static struct lock hsl_mtx;
  * initialization to happen before the first lookup.
  */
 
-static void __match_proto__(hash_start_f)
+static void v_matchproto_(hash_start_f)
 hsl_start(void)
 {
 
@@ -63,7 +63,7 @@ hsl_start(void)
  * A reference to the returned object is held.
  */
 
-static struct objhead * __match_proto__(hash_lookup_f)
+static struct objhead * v_matchproto_(hash_lookup_f)
 hsl_lookup(struct worker *wrk, const void *digest, struct objhead **noh)
 {
 	struct objhead *oh;
@@ -107,7 +107,7 @@ hsl_lookup(struct worker *wrk, const void *digest, struct objhead **noh)
  * Dereference and if no references are left, free.
  */
 
-static int __match_proto__(hash_deref_f)
+static int v_matchproto_(hash_deref_f)
 hsl_deref(struct objhead *oh)
 {
 	int ret;
diff --git a/bin/varnishd/hpack/vhp_decode.c b/bin/varnishd/hpack/vhp_decode.c
index 328d197..fa1e652 100644
--- a/bin/varnishd/hpack/vhp_decode.c
+++ b/bin/varnishd/hpack/vhp_decode.c
@@ -106,7 +106,7 @@ vhd_next_state(struct vhd_decode *d)
 }
 
 /* State functions */
-static enum vhd_ret_e __match_proto__(vhd_state_f)
+static enum vhd_ret_e v_matchproto_(vhd_state_f)
 vhd_skip(struct vhd_ctx *ctx, unsigned first)
 {
 	AN(ctx);
@@ -115,7 +115,7 @@ vhd_skip(struct vhd_ctx *ctx, unsigned first)
 	return (VHD_AGAIN);
 }
 
-static enum vhd_ret_e __match_proto__(vhd_state_f)
+static enum vhd_ret_e v_matchproto_(vhd_state_f)
 vhd_goto(struct vhd_ctx *ctx, unsigned first)
 {
 	const struct vhd_state *s;
@@ -129,7 +129,7 @@ vhd_goto(struct vhd_ctx *ctx, unsigned first)
 	return (VHD_AGAIN);
 }
 
-static enum vhd_ret_e __match_proto__(vhd_state_f)
+static enum vhd_ret_e v_matchproto_(vhd_state_f)
 vhd_idle(struct vhd_ctx *ctx, unsigned first)
 {
 	uint8_t c;
@@ -157,7 +157,7 @@ vhd_idle(struct vhd_ctx *ctx, unsigned first)
 	return (VHD_OK);
 }
 
-static enum vhd_ret_e __match_proto__(vhd_state_f)
+static enum vhd_ret_e v_matchproto_(vhd_state_f)
 vhd_integer(struct vhd_ctx *ctx, unsigned first)
 {
 	const struct vhd_state *s;
@@ -204,7 +204,7 @@ vhd_integer(struct vhd_ctx *ctx, unsigned first)
 	return (VHD_MORE);
 }
 
-static enum vhd_ret_e __match_proto__(vhd_state_f)
+static enum vhd_ret_e v_matchproto_(vhd_state_f)
 vhd_set_max(struct vhd_ctx *ctx, unsigned first)
 {
 	AN(ctx);
@@ -218,7 +218,7 @@ vhd_set_max(struct vhd_ctx *ctx, unsigned first)
 	return (VHD_AGAIN);
 }
 
-static enum vhd_ret_e __match_proto__(vhd_state_f)
+static enum vhd_ret_e v_matchproto_(vhd_state_f)
 vhd_set_idx(struct vhd_ctx *ctx, unsigned first)
 {
 	AN(ctx);
@@ -229,7 +229,7 @@ vhd_set_idx(struct vhd_ctx *ctx, unsigned first)
 	return (VHD_AGAIN);
 }
 
-static enum vhd_ret_e __match_proto__(vhd_state_f)
+static enum vhd_ret_e v_matchproto_(vhd_state_f)
 vhd_lookup(struct vhd_ctx *ctx, unsigned first)
 {
 	const struct vhd_state *s;
@@ -283,7 +283,7 @@ vhd_lookup(struct vhd_ctx *ctx, unsigned first)
 	return (VHD_BUF);
 }
 
-static enum vhd_ret_e __match_proto__(vhd_state_f)
+static enum vhd_ret_e v_matchproto_(vhd_state_f)
 vhd_new(struct vhd_ctx *ctx, unsigned first)
 {
 	AN(ctx);
@@ -294,7 +294,7 @@ vhd_new(struct vhd_ctx *ctx, unsigned first)
 	return (VHD_AGAIN);
 }
 
-static enum vhd_ret_e __match_proto__(vhd_state_f)
+static enum vhd_ret_e v_matchproto_(vhd_state_f)
 vhd_new_idx(struct vhd_ctx *ctx, unsigned first)
 {
 	AN(ctx);
@@ -307,7 +307,7 @@ vhd_new_idx(struct vhd_ctx *ctx, unsigned first)
 	return (VHD_AGAIN);
 }
 
-static enum vhd_ret_e __match_proto__(vhd_state_f)
+static enum vhd_ret_e v_matchproto_(vhd_state_f)
 vhd_branch_zidx(struct vhd_ctx *ctx, unsigned first)
 {
 	const struct vhd_state *s;
@@ -325,7 +325,7 @@ vhd_branch_zidx(struct vhd_ctx *ctx, unsigned first)
 	return (VHD_AGAIN);
 }
 
-static enum vhd_ret_e __match_proto__(vhd_state_f)
+static enum vhd_ret_e v_matchproto_(vhd_state_f)
 vhd_branch_bit0(struct vhd_ctx *ctx, unsigned first)
 {
 	const struct vhd_state *s;
@@ -346,7 +346,7 @@ vhd_branch_bit0(struct vhd_ctx *ctx, unsigned first)
 	return (VHD_AGAIN);
 }
 
-static enum vhd_ret_e __match_proto__(vhd_state_f)
+static enum vhd_ret_e v_matchproto_(vhd_state_f)
 vhd_raw(struct vhd_ctx *ctx, unsigned first)
 {
 	const struct vhd_state *s;
@@ -398,7 +398,7 @@ vhd_raw(struct vhd_ctx *ctx, unsigned first)
 	return (s->arg1);
 }
 
-static enum vhd_ret_e __match_proto__(vhd_state_f)
+static enum vhd_ret_e v_matchproto_(vhd_state_f)
 vhd_huffman(struct vhd_ctx *ctx, unsigned first)
 {
 	const struct vhd_state *s;
diff --git a/bin/varnishd/http1/cache_http1_deliver.c b/bin/varnishd/http1/cache_http1_deliver.c
index 99f855d..f4bfb03 100644
--- a/bin/varnishd/http1/cache_http1_deliver.c
+++ b/bin/varnishd/http1/cache_http1_deliver.c
@@ -35,7 +35,7 @@
 
 /*--------------------------------------------------------------------*/
 
-static int __match_proto__(vdp_bytes)
+static int v_matchproto_(vdp_bytes)
 v1d_bytes(struct req *req, enum vdp_action act, void **priv,
     const void *ptr, ssize_t len)
 {
@@ -83,7 +83,7 @@ v1d_error(struct req *req, const char *msg)
 /*--------------------------------------------------------------------
  */
 
-void __match_proto__(vtr_deliver_f)
+void v_matchproto_(vtr_deliver_f)
 V1D_Deliver(struct req *req, struct boc *boc, int sendbody)
 {
 	int err;
diff --git a/bin/varnishd/http1/cache_http1_fetch.c b/bin/varnishd/http1/cache_http1_fetch.c
index 81acbda..07a2194 100644
--- a/bin/varnishd/http1/cache_http1_fetch.c
+++ b/bin/varnishd/http1/cache_http1_fetch.c
@@ -45,7 +45,7 @@
  * Pass the request body to the backend
  */
 
-static int __match_proto__(objiterate_f)
+static int v_matchproto_(objiterate_f)
 vbf_iter_req_body(void *priv, int flush, const void *ptr, ssize_t l)
 {
 	struct busyobj *bo;
diff --git a/bin/varnishd/http1/cache_http1_fsm.c b/bin/varnishd/http1/cache_http1_fsm.c
index 6e8de47..c4cda48 100644
--- a/bin/varnishd/http1/cache_http1_fsm.c
+++ b/bin/varnishd/http1/cache_http1_fsm.c
@@ -74,7 +74,7 @@ http1_getstate(const struct sess *sp)
  * Call protocol for this request
  */
 
-static void __match_proto__(task_func_t)
+static void v_matchproto_(task_func_t)
 http1_req(struct worker *wrk, void *arg)
 {
 	struct req *req;
@@ -101,7 +101,7 @@ http1_req(struct worker *wrk, void *arg)
  * must obey this calling convention with a dummy reservation.
  */
 
-static void __match_proto__(task_func_t)
+static void v_matchproto_(task_func_t)
 http1_new_session(struct worker *wrk, void *arg)
 {
 	struct sess *sp;
@@ -120,7 +120,7 @@ http1_new_session(struct worker *wrk, void *arg)
 	wrk->task.priv = req;
 }
 
-static void __match_proto__(task_func_t)
+static void v_matchproto_(task_func_t)
 http1_unwait(struct worker *wrk, void *arg)
 {
 	struct sess *sp;
@@ -138,7 +138,7 @@ http1_unwait(struct worker *wrk, void *arg)
 	wrk->task.priv = req;
 }
 
-static void __match_proto__(vtr_req_body_t)
+static void v_matchproto_(vtr_req_body_t)
 http1_req_body(struct req *req)
 {
 
@@ -169,7 +169,7 @@ http1_req_panic(struct vsb *vsb, const struct req *req)
 	VSB_printf(vsb, "state = %s\n", http1_getstate(req->sp));
 }
 
-static void __match_proto__(vtr_req_fail_f)
+static void v_matchproto_(vtr_req_fail_f)
 http1_req_fail(struct req *req, enum sess_close reason)
 {
 	assert(reason > 0);
@@ -178,7 +178,7 @@ http1_req_fail(struct req *req, enum sess_close reason)
 		SES_Close(req->sp, reason);
 }
 
-static void __match_proto__(vtr_reembark_f)
+static void v_matchproto_(vtr_reembark_f)
 http1_reembark(struct worker *wrk, struct req *req)
 {
 	struct sess *sp;
@@ -203,7 +203,7 @@ http1_reembark(struct worker *wrk, struct req *req)
 	usleep(10000);
 }
 
-static int __match_proto__(vtr_minimal_response_f)
+static int v_matchproto_(vtr_minimal_response_f)
 http1_minimal_response(struct req *req, uint16_t status)
 {
 	size_t wl, l;
diff --git a/bin/varnishd/http1/cache_http1_proto.c b/bin/varnishd/http1/cache_http1_proto.c
index 4cc8b4d..b3fbde7 100644
--- a/bin/varnishd/http1/cache_http1_proto.c
+++ b/bin/varnishd/http1/cache_http1_proto.c
@@ -64,7 +64,7 @@ const int HTTP1_Resp[3] = {
  * Check if we have a complete HTTP request or response yet
  */
 
-enum htc_status_e __match_proto__(htc_complete_f)
+enum htc_status_e v_matchproto_(htc_complete_f)
 HTTP1_Complete(struct http_conn *htc)
 {
 	char *p;
diff --git a/bin/varnishd/http1/cache_http1_vfp.c b/bin/varnishd/http1/cache_http1_vfp.c
index 38cfde8..36228cc 100644
--- a/bin/varnishd/http1/cache_http1_vfp.c
+++ b/bin/varnishd/http1/cache_http1_vfp.c
@@ -91,7 +91,7 @@ v1f_read(const struct vfp_ctx *vc, struct http_conn *htc, void *d, ssize_t len)
  * XXX: Reading one byte at a time is pretty pessimal.
  */
 
-static enum vfp_status __match_proto__(vfp_pull_f)
+static enum vfp_status v_matchproto_(vfp_pull_f)
 v1f_pull_chunked(struct vfp_ctx *vc, struct vfp_entry *vfe, void *ptr,
     ssize_t *lp)
 {
@@ -187,7 +187,7 @@ static const struct vfp v1f_chunked = {
 
 /*--------------------------------------------------------------------*/
 
-static enum vfp_status __match_proto__(vfp_pull_f)
+static enum vfp_status v_matchproto_(vfp_pull_f)
 v1f_pull_straight(struct vfp_ctx *vc, struct vfp_entry *vfe, void *p,
     ssize_t *lp)
 {
@@ -224,7 +224,7 @@ static const struct vfp v1f_straight = {
 
 /*--------------------------------------------------------------------*/
 
-static enum vfp_status __match_proto__(vfp_pull_f)
+static enum vfp_status v_matchproto_(vfp_pull_f)
 v1f_pull_eof(struct vfp_ctx *vc, struct vfp_entry *vfe, void *p, ssize_t *lp)
 {
 	ssize_t l, lr;
diff --git a/bin/varnishd/http2/cache_http2_deliver.c b/bin/varnishd/http2/cache_http2_deliver.c
index f01a120..fc3eeca 100644
--- a/bin/varnishd/http2/cache_http2_deliver.c
+++ b/bin/varnishd/http2/cache_http2_deliver.c
@@ -72,7 +72,7 @@ V2D_Init(void)
 
 /**********************************************************************/
 
-static int __match_proto__(vdp_bytes)
+static int v_matchproto_(vdp_bytes)
 h2_bytes(struct req *req, enum vdp_action act, void **priv,
     const void *ptr, ssize_t len)
 {
@@ -126,7 +126,7 @@ h2_status(uint8_t *p, uint16_t status) {
 	return (l);
 }
 
-int __match_proto__(vtr_minimal_response_f)
+int v_matchproto_(vtr_minimal_response_f)
 h2_minimal_response(struct req *req, uint16_t status)
 {
 	struct h2_req *r2;
@@ -178,7 +178,7 @@ h2_enc_len(uint8_t *p, unsigned bits, unsigned val)
 	return (p);
 }
 
-void __match_proto__(vtr_deliver_f)
+void v_matchproto_(vtr_deliver_f)
 h2_deliver(struct req *req, struct boc *boc, int sendbody)
 {
 	ssize_t sz, sz1;
diff --git a/bin/varnishd/http2/cache_http2_proto.c b/bin/varnishd/http2/cache_http2_proto.c
index 3ad572b..a43bc5c 100644
--- a/bin/varnishd/http2/cache_http2_proto.c
+++ b/bin/varnishd/http2/cache_http2_proto.c
@@ -266,7 +266,7 @@ h2_vsl_frame(const struct h2_sess *h2, const void *ptr, size_t len)
 /**********************************************************************
  */
 
-static h2_error __match_proto__(h2_frame_f)
+static h2_error v_matchproto_(h2_frame_f)
 h2_rx_ping(struct worker *wrk, struct h2_sess *h2, struct h2_req *r2)
 {
 
@@ -287,7 +287,7 @@ h2_rx_ping(struct worker *wrk, struct h2_sess *h2, struct h2_req *r2)
 /**********************************************************************
  */
 
-static h2_error __match_proto__(h2_frame_f)
+static h2_error v_matchproto_(h2_frame_f)
 h2_rx_push_promise(struct worker *wrk, struct h2_sess *h2, struct h2_req *r2)
 {
 
@@ -301,7 +301,7 @@ h2_rx_push_promise(struct worker *wrk, struct h2_sess *h2, struct h2_req *r2)
 /**********************************************************************
  */
 
-static h2_error __match_proto__(h2_frame_f)
+static h2_error v_matchproto_(h2_frame_f)
 h2_rx_rst_stream(struct worker *wrk, struct h2_sess *h2, struct h2_req *r2)
 {
 
@@ -319,7 +319,7 @@ h2_rx_rst_stream(struct worker *wrk, struct h2_sess *h2, struct h2_req *r2)
 /**********************************************************************
  */
 
-static h2_error __match_proto__(h2_frame_f)
+static h2_error v_matchproto_(h2_frame_f)
 h2_rx_goaway(struct worker *wrk, struct h2_sess *h2, struct h2_req *r2)
 {
 
@@ -337,7 +337,7 @@ h2_rx_goaway(struct worker *wrk, struct h2_sess *h2, struct h2_req *r2)
 /**********************************************************************
  */
 
-static h2_error __match_proto__(h2_frame_f)
+static h2_error v_matchproto_(h2_frame_f)
 h2_rx_window_update(struct worker *wrk, struct h2_sess *h2, struct h2_req *r2)
 {
 	uint32_t wu;
@@ -367,7 +367,7 @@ h2_rx_window_update(struct worker *wrk, struct h2_sess *h2, struct h2_req *r2)
  * Incoming PRIORITY, possibly an ACK of one we sent.
  */
 
-static h2_error __match_proto__(h2_frame_f)
+static h2_error v_matchproto_(h2_frame_f)
 h2_rx_priority(struct worker *wrk, struct h2_sess *h2, struct h2_req *r2)
 {
 
@@ -382,7 +382,7 @@ h2_rx_priority(struct worker *wrk, struct h2_sess *h2, struct h2_req *r2)
  */
 
 #define H2_SETTING(U,l, ...)					\
-static void __match_proto__(h2_setsetting_f)			\
+static void v_matchproto_(h2_setsetting_f)			\
 h2_setting_##l(struct h2_settings* s, uint32_t v)		\
 {								\
 	s -> l = v;						\
@@ -440,7 +440,7 @@ h2_set_setting(struct h2_sess *h2, const uint8_t *d)
 	return (0);
 }
 
-static h2_error __match_proto__(h2_frame_f)
+static h2_error v_matchproto_(h2_frame_f)
 h2_rx_settings(struct worker *wrk, struct h2_sess *h2, struct h2_req *r2)
 {
 	const uint8_t *p;
@@ -476,7 +476,7 @@ h2_rx_settings(struct worker *wrk, struct h2_sess *h2, struct h2_req *r2)
  * Incoming HEADERS, this is where the partys at...
  */
 
-void __match_proto__(task_func_t)
+void v_matchproto_(task_func_t)
 h2_do_req(struct worker *wrk, void *priv)
 {
 	struct req *req;
@@ -547,7 +547,7 @@ h2_end_headers(struct worker *wrk, struct h2_sess *h2,
 	return (0);
 }
 
-static h2_error __match_proto__(h2_frame_f)
+static h2_error v_matchproto_(h2_frame_f)
 h2_rx_headers(struct worker *wrk, struct h2_sess *h2, struct h2_req *r2)
 {
 	struct req *req;
@@ -624,7 +624,7 @@ h2_rx_headers(struct worker *wrk, struct h2_sess *h2, struct h2_req *r2)
 
 /**********************************************************************/
 
-static h2_error __match_proto__(h2_frame_f)
+static h2_error v_matchproto_(h2_frame_f)
 h2_rx_continuation(struct worker *wrk, struct h2_sess *h2, struct h2_req *r2)
 {
 	struct req *req;
@@ -653,7 +653,7 @@ h2_rx_continuation(struct worker *wrk, struct h2_sess *h2, struct h2_req *r2)
 
 /**********************************************************************/
 
-static h2_error __match_proto__(h2_frame_f)
+static h2_error v_matchproto_(h2_frame_f)
 h2_rx_data(struct worker *wrk, struct h2_sess *h2, struct h2_req *r2)
 {
 	int w1 = 0, w2 = 0;
@@ -699,7 +699,7 @@ h2_rx_data(struct worker *wrk, struct h2_sess *h2, struct h2_req *r2)
 	return (0);
 }
 
-static enum vfp_status __match_proto__(vfp_pull_f)
+static enum vfp_status v_matchproto_(vfp_pull_f)
 h2_vfp_body(struct vfp_ctx *vc, struct vfp_entry *vfe, void *ptr, ssize_t *lp)
 {
 	struct h2_req *r2;
@@ -750,7 +750,7 @@ static const struct vfp h2_body = {
 	.pull = h2_vfp_body,
 };
 
-void __match_proto__(vtr_req_body_t)
+void v_matchproto_(vtr_req_body_t)
 h2_req_body(struct req *req)
 {
 	struct h2_req *r2;
@@ -765,7 +765,7 @@ h2_req_body(struct req *req)
 
 /**********************************************************************/
 
-void __match_proto__(vtr_req_fail_f)
+void v_matchproto_(vtr_req_fail_f)
 h2_req_fail(struct req *req, enum sess_close reason)
 {
 	assert(reason > 0);
@@ -775,7 +775,7 @@ h2_req_fail(struct req *req, enum sess_close reason)
 
 /**********************************************************************/
 
-static enum htc_status_e __match_proto__(htc_complete_f)
+static enum htc_status_e v_matchproto_(htc_complete_f)
 h2_frame_complete(struct http_conn *htc)
 {
 	int l;
diff --git a/bin/varnishd/http2/cache_http2_session.c b/bin/varnishd/http2/cache_http2_session.c
index b00395f..fcee836 100644
--- a/bin/varnishd/http2/cache_http2_session.c
+++ b/bin/varnishd/http2/cache_http2_session.c
@@ -116,7 +116,7 @@ h2_new_sess(const struct worker *wrk, struct sess *sp, struct req *srq)
 
 /**********************************************************************/
 
-enum htc_status_e __match_proto__(htc_complete_f)
+enum htc_status_e v_matchproto_(htc_complete_f)
 H2_prism_complete(struct http_conn *htc)
 {
 	int l;
@@ -270,7 +270,7 @@ H2_OU_Sess(struct worker *wrk, struct sess *sp, struct req *req)
 	SES_SetTransport(wrk, sp, req, &H2_transport);
 }
 
-static void __match_proto__(task_func_t)
+static void v_matchproto_(task_func_t)
 h2_new_session(struct worker *wrk, void *arg)
 {
 	struct req *req;
@@ -351,7 +351,7 @@ h2_new_session(struct worker *wrk, void *arg)
 	h2_del_req(wrk, h2->req0);
 }
 
-static void __match_proto__(vtr_reembark_f)
+static void v_matchproto_(vtr_reembark_f)
 h2_reembark(struct worker *wrk, struct req *req)
 {
 	struct sess *sp;
diff --git a/bin/varnishd/mgt/mgt.h b/bin/varnishd/mgt/mgt.h
index cde0c11..9a03a4a 100644
--- a/bin/varnishd/mgt/mgt.h
+++ b/bin/varnishd/mgt/mgt.h
@@ -38,10 +38,11 @@
 
 #include <sys/types.h>
 
+#include "vdef.h"
+
 #include "miniobj.h"
 #include "vas.h"
 #include "vcs.h"
-#include "vdef.h"
 #include "vqueue.h"
 #include "vsb.h"
 
@@ -82,7 +83,7 @@ typedef int mgt_cli_close_f(void *priv);
 void mgt_cli_setup(int fdi, int fdo, int auth, const char *ident,
     mgt_cli_close_f *close_func, void *priv);
 int mgt_cli_askchild(unsigned *status, char **resp, const char *fmt, ...)
-    __v_printflike(3, 4);
+    v_printflike_(3, 4);
 void mgt_cli_start_child(int fdi, int fdo);
 void mgt_cli_stop_child(void);
 void mgt_cli_telnet(const char *T_arg);
@@ -167,7 +168,7 @@ enum mcf_which_e {
 	MCF_MAXIMUM = 34,
 };
 void MCF_ParamConf(enum mcf_which_e, const char *param, const char *, ...)
-    __v_printflike(3, 4);
+    v_printflike_(3, 4);
 
 void MCF_ParamSet(struct cli *, const char *param, const char *val);
 void MCF_ParamProtect(struct cli *, const char *arg);
@@ -193,7 +194,7 @@ char *mgt_HostName(void);
 void mgt_ProcTitle(const char *comp);
 void mgt_DumpRstVsl(void);
 struct vsb *mgt_BuildVident(void);
-void MGT_Complain(const char *, const char *, ...) __v_printflike(2, 3);
+void MGT_Complain(const char *, const char *, ...) v_printflike_(2, 3);
 const void *MGT_Pick(const struct choice *, const char *, const char *);
 char **MGT_NamedArg(const char *, const char **, const char *);
 
diff --git a/bin/varnishd/mgt/mgt_acceptor.c b/bin/varnishd/mgt/mgt_acceptor.c
index e834786..0006716 100644
--- a/bin/varnishd/mgt/mgt_acceptor.c
+++ b/bin/varnishd/mgt/mgt_acceptor.c
@@ -99,7 +99,7 @@ MAC_reopen_sockets(void)
 
 /*--------------------------------------------------------------------*/
 
-static int __match_proto__(vss_resolved_f)
+static int v_matchproto_(vss_resolved_f)
 mac_callback(void *priv, const struct suckaddr *sa)
 {
 	struct listen_arg *la;
diff --git a/bin/varnishd/mgt/mgt_child.c b/bin/varnishd/mgt/mgt_child.c
index 7c9f3c0..c0ce43d 100644
--- a/bin/varnishd/mgt/mgt_child.c
+++ b/bin/varnishd/mgt/mgt_child.c
@@ -116,7 +116,7 @@ mgt_panic_clear(void)
 	VSB_destroy(&child_panic);
 }
 
-static void __match_proto__(cli_func_t)
+static void v_matchproto_(cli_func_t)
 mch_cli_panic_show(struct cli *cli, const char * const *av, void *priv)
 {
 	(void)av;
@@ -132,7 +132,7 @@ mch_cli_panic_show(struct cli *cli, const char * const *av, void *priv)
 	VCLI_Out(cli, "%s\n", VSB_data(child_panic));
 }
 
-static void __match_proto__(cli_func_t)
+static void v_matchproto_(cli_func_t)
 mch_cli_panic_clear(struct cli *cli, const char * const *av, void *priv)
 {
 	(void)priv;
@@ -204,7 +204,7 @@ MCH_Fd_Inherit(int fd, const char *what)
  * Listen to stdout+stderr from the child
  */
 
-static int __match_proto__(vlu_f)
+static int v_matchproto_(vlu_f)
 child_line(void *priv, const char *p)
 {
 	(void)priv;
@@ -217,7 +217,7 @@ child_line(void *priv, const char *p)
  * NB: Notice cleanup call from mgt_reap_child()
  */
 
-static int __match_proto__(vev_cb_f)
+static int v_matchproto_(vev_cb_f)
 child_listener(const struct vev *e, int what)
 {
 
@@ -234,7 +234,7 @@ child_listener(const struct vev *e, int what)
  * Periodically poke the child, to see that it still lives
  */
 
-static int __match_proto__(vev_cb_f)
+static int v_matchproto_(vev_cb_f)
 child_poker(const struct vev *e, int what)
 {
 	char *r = NULL;
@@ -611,7 +611,7 @@ MCH_Running(void)
  * CLI commands
  */
 
-static void __match_proto__(cli_func_t)
+static void v_matchproto_(cli_func_t)
 mch_cli_server_start(struct cli *cli, const char * const *av, void *priv)
 {
 
@@ -630,7 +630,7 @@ mch_cli_server_start(struct cli *cli, const char * const *av, void *priv)
 	}
 }
 
-static void __match_proto__(cli_func_t)
+static void v_matchproto_(cli_func_t)
 mch_cli_server_stop(struct cli *cli, const char * const *av, void *priv)
 {
 
@@ -644,7 +644,7 @@ mch_cli_server_stop(struct cli *cli, const char * const *av, void *priv)
 	}
 }
 
-static void __match_proto__(cli_func_t)
+static void v_matchproto_(cli_func_t)
 mch_cli_server_status(struct cli *cli, const char * const *av, void *priv)
 {
 	(void)av;
diff --git a/bin/varnishd/mgt/mgt_cli.c b/bin/varnishd/mgt/mgt_cli.c
index 9f0a67d..bc9c2a7 100644
--- a/bin/varnishd/mgt/mgt_cli.c
+++ b/bin/varnishd/mgt/mgt_cli.c
@@ -72,7 +72,7 @@ static struct vsb	*cli_buf = NULL;
 
 /*--------------------------------------------------------------------*/
 
-static void __match_proto__(cli_func_t)
+static void v_matchproto_(cli_func_t)
 mcf_banner(struct cli *cli, const char *const *av, void *priv)
 {
 
@@ -100,7 +100,7 @@ static struct cli_proto cli_proto[] = {
 
 /*--------------------------------------------------------------------*/
 
-static void __match_proto__(cli_func_t)
+static void v_matchproto_(cli_func_t)
 mcf_panic(struct cli *cli, const char * const *av, void *priv)
 {
 
@@ -117,7 +117,7 @@ static struct cli_proto cli_debug[] = {
 
 /*--------------------------------------------------------------------*/
 
-static void __match_proto__(cli_func_t)
+static void v_matchproto_(cli_func_t)
 mcf_askchild(struct cli *cli, const char * const *av, void *priv)
 {
 	int i;
@@ -307,7 +307,7 @@ mcf_auth(struct cli *cli, const char *const *av, void *priv)
 
 /*--------------------------------------------------------------------*/
 
-static void __match_proto__(cli_func_t)
+static void v_matchproto_(cli_func_t)
 mcf_help(struct cli *cli, const char * const *av, void *priv)
 {
 	if (cli_o <= 0)
@@ -316,7 +316,7 @@ mcf_help(struct cli *cli, const char * const *av, void *priv)
 		mcf_askchild(cli, av, priv);
 }
 
-static void __match_proto__(cli_func_t)
+static void v_matchproto_(cli_func_t)
 mcf_help_json(struct cli *cli, const char * const *av, void *priv)
 {
 	if (cli_o <= 0)
@@ -506,7 +506,7 @@ mgt_cli_secret(const char *S_arg)
 	secret_file = S_arg;
 }
 
-static int __match_proto__(vss_resolved_f)
+static int v_matchproto_(vss_resolved_f)
 mct_callback(void *priv, const struct suckaddr *sa)
 {
 	int sock;
@@ -572,7 +572,7 @@ static double M_poll = 0.1;
 static VTAILQ_HEAD(,m_addr)	m_addr_list =
     VTAILQ_HEAD_INITIALIZER(m_addr_list);
 
-static int __match_proto__(mgt_cli_close_f)
+static int v_matchproto_(mgt_cli_close_f)
 Marg_closer(void *priv)
 {
 
@@ -581,7 +581,7 @@ Marg_closer(void *priv)
 	return(0);
 }
 
-static int __match_proto__(vev_cb_f)
+static int v_matchproto_(vev_cb_f)
 Marg_connect(const struct vev *e, int what)
 {
 	struct vsb *vsb;
@@ -609,7 +609,7 @@ Marg_connect(const struct vev *e, int what)
 	return (1);
 }
 
-static int __match_proto__(vev_cb_f)
+static int v_matchproto_(vev_cb_f)
 Marg_poker(const struct vev *e, int what)
 {
 	int s;
@@ -643,7 +643,7 @@ Marg_poker(const struct vev *e, int what)
 	return (0);
 }
 
-static int __match_proto__(vss_resolved_f)
+static int v_matchproto_(vss_resolved_f)
 marg_cb(void *priv, const struct suckaddr *sa)
 {
 	struct m_addr *ma;
diff --git a/bin/varnishd/mgt/mgt_jail.c b/bin/varnishd/mgt/mgt_jail.c
index b413821..1e26487 100644
--- a/bin/varnishd/mgt/mgt_jail.c
+++ b/bin/varnishd/mgt/mgt_jail.c
@@ -47,7 +47,7 @@
  * A "none" jail implementation which doesn't do anything.
  */
 
-static int __match_proto__(jail_init_f)
+static int v_matchproto_(jail_init_f)
 vjn_init(char **args)
 {
 	if (args != NULL && *args != NULL)
@@ -55,13 +55,13 @@ vjn_init(char **args)
 	return (0);
 }
 
-static void __match_proto__(jail_master_f)
+static void v_matchproto_(jail_master_f)
 vjn_master(enum jail_master_e jme)
 {
 	(void)jme;
 }
 
-static void __match_proto__(jail_subproc_f)
+static void v_matchproto_(jail_subproc_f)
 vjn_subproc(enum jail_subproc_e jse)
 {
 	(void)jse;
diff --git a/bin/varnishd/mgt/mgt_jail_solaris.c b/bin/varnishd/mgt/mgt_jail_solaris.c
index 55d8b3b..338cae3 100644
--- a/bin/varnishd/mgt/mgt_jail_solaris.c
+++ b/bin/varnishd/mgt/mgt_jail_solaris.c
@@ -252,7 +252,7 @@ jail_master_gen(enum jail_master_e e)
 	return (enum jail_gen_e)(e << JAILG_SHIFT);
 }
 
-static int __match_proto__(jail_init_f)
+static int v_matchproto_(jail_init_f)
 vjs_init(char **args)
 {
 	(void)args;
@@ -499,7 +499,7 @@ vjs_waive(enum jail_gen_e jge)
 	priv_freeset(inheritable);
 }
 
-static void __match_proto__(jail_subproc_f)
+static void v_matchproto_(jail_subproc_f)
 vjs_subproc(enum jail_subproc_e jse)
 {
 	enum jail_gen_e jge = jail_subproc_gen(jse);
@@ -508,7 +508,7 @@ vjs_subproc(enum jail_subproc_e jse)
 	vjs_waive(jge);
 }
 
-static void __match_proto__(jail_master_f)
+static void v_matchproto_(jail_master_f)
 vjs_master(enum jail_master_e jme)
 {
 	enum jail_gen_e jge = jail_master_gen(jme);
diff --git a/bin/varnishd/mgt/mgt_jail_unix.c b/bin/varnishd/mgt/mgt_jail_unix.c
index 27cebb1..c4ba4c5 100644
--- a/bin/varnishd/mgt/mgt_jail_unix.c
+++ b/bin/varnishd/mgt/mgt_jail_unix.c
@@ -120,7 +120,7 @@ vju_getccgid(const char *arg)
 /**********************************************************************
  */
 
-static int __match_proto__(jail_init_f)
+static int v_matchproto_(jail_init_f)
 vju_init(char **args)
 {
 	if (args == NULL) {
@@ -184,7 +184,7 @@ vju_init(char **args)
 	return (0);
 }
 
-static void __match_proto__(jail_master_f)
+static void v_matchproto_(jail_master_f)
 vju_master(enum jail_master_e jme)
 {
 	if (jme == JAIL_MASTER_LOW) {
@@ -196,7 +196,7 @@ vju_master(enum jail_master_e jme)
 	}
 }
 
-static void __match_proto__(jail_subproc_f)
+static void v_matchproto_(jail_subproc_f)
 vju_subproc(enum jail_subproc_e jse)
 {
 	int i;
@@ -239,7 +239,7 @@ vju_subproc(enum jail_subproc_e jse)
 #endif
 }
 
-static int __match_proto__(jail_make_dir_f)
+static int v_matchproto_(jail_make_dir_f)
 vju_make_vcldir(const char *dname)
 {
 	AZ(seteuid(0));
@@ -255,7 +255,7 @@ vju_make_vcldir(const char *dname)
 }
 
 
-static void __match_proto__(jail_fixfd_f)
+static void v_matchproto_(jail_fixfd_f)
 vju_fixfd(int fd, enum jail_fixfd_e what)
 {
 	/* Called under JAIL_MASTER_FILE */
diff --git a/bin/varnishd/mgt/mgt_main.c b/bin/varnishd/mgt/mgt_main.c
index b7e8251..9aee532 100644
--- a/bin/varnishd/mgt/mgt_main.c
+++ b/bin/varnishd/mgt/mgt_main.c
@@ -181,7 +181,7 @@ cli_check(const struct cli *cli)
  * This function is called when the CLI on stdin is closed.
  */
 
-static int __match_proto__(mgt_cli_close_f)
+static int v_matchproto_(mgt_cli_close_f)
 mgt_stdin_close(void *priv)
 {
 
@@ -347,7 +347,7 @@ mgt_eric_im_done(int eric_fd, unsigned u)
 
 /*--------------------------------------------------------------------*/
 
-static int __match_proto__(vev_cb_f)
+static int v_matchproto_(vev_cb_f)
 mgt_sigint(const struct vev *e, int what)
 {
 
@@ -362,7 +362,7 @@ mgt_sigint(const struct vev *e, int what)
 
 /*--------------------------------------------------------------------*/
 
-static int __match_proto__(vev_cb_f)
+static int v_matchproto_(vev_cb_f)
 mgt_uptime(const struct vev *e, int what)
 {
 	static double mgt_uptime_t0 = 0;
@@ -378,7 +378,7 @@ mgt_uptime(const struct vev *e, int what)
 
 /*--------------------------------------------------------------------*/
 
-static int __match_proto__(mgt_cli_close_f)
+static int v_matchproto_(mgt_cli_close_f)
 mgt_I_close(void *priv)
 {
 	(void)priv;
diff --git a/bin/varnishd/mgt/mgt_param.c b/bin/varnishd/mgt/mgt_param.c
index 9cb4900..2d262e9 100644
--- a/bin/varnishd/mgt/mgt_param.c
+++ b/bin/varnishd/mgt/mgt_param.c
@@ -235,7 +235,7 @@ mcf_wrap(struct cli *cli, const char *text)
 
 /*--------------------------------------------------------------------*/
 
-static void __match_proto__(cli_func_t)
+static void v_matchproto_(cli_func_t)
 mcf_param_show(struct cli *cli, const char * const *av, void *priv)
 {
 	int n;
@@ -401,7 +401,7 @@ MCF_ParamSet(struct cli *cli, const char *param, const char *val)
 
 /*--------------------------------------------------------------------*/
 
-static void __match_proto__(cli_func_t)
+static void v_matchproto_(cli_func_t)
 mcf_param_set(struct cli *cli, const char * const *av, void *priv)
 {
 
diff --git a/bin/varnishd/mgt/mgt_vcc.c b/bin/varnishd/mgt/mgt_vcc.c
index 42f4b6d..3c01059 100644
--- a/bin/varnishd/mgt/mgt_vcc.c
+++ b/bin/varnishd/mgt/mgt_vcc.c
@@ -83,7 +83,7 @@ mgt_DumpBuiltin(void)
  * Invoke system VCC compiler in a sub-process
  */
 
-static void __match_proto__(vsub_func_f)
+static void v_matchproto_(vsub_func_f)
 run_vcc(void *priv)
 {
 	struct vsb *csrc;
@@ -137,7 +137,7 @@ run_vcc(void *priv)
  * Invoke system C compiler in a sub-process
  */
 
-static void __match_proto__(vsub_func_f)
+static void v_matchproto_(vsub_func_f)
 run_cc(void *priv)
 {
 	struct vcc_priv *vp;
@@ -189,7 +189,7 @@ run_cc(void *priv)
  * Attempt to open compiled VCL in a sub-process
  */
 
-static void __match_proto__(vsub_func_f)
+static void v_matchproto_(vsub_func_f)
 run_dlopen(void *priv)
 {
 	struct vcc_priv *vp;
diff --git a/bin/varnishd/mgt/mgt_vcl.c b/bin/varnishd/mgt/mgt_vcl.c
index 671fc21..ae31eed 100644
--- a/bin/varnishd/mgt/mgt_vcl.c
+++ b/bin/varnishd/mgt/mgt_vcl.c
@@ -603,7 +603,7 @@ mgt_push_vcls_and_start(struct cli *cli, unsigned *status, char **p)
 
 /*--------------------------------------------------------------------*/
 
-static void __match_proto__(cli_func_t)
+static void v_matchproto_(cli_func_t)
 mcf_vcl_inline(struct cli *cli, const char * const *av, void *priv)
 {
 
@@ -615,7 +615,7 @@ mcf_vcl_inline(struct cli *cli, const char * const *av, void *priv)
 	mgt_new_vcl(cli, av[2], av[3], "<vcl.inline>", av[4], 0);
 }
 
-static void __match_proto__(cli_func_t)
+static void v_matchproto_(cli_func_t)
 mcf_vcl_load(struct cli *cli, const char * const *av, void *priv)
 {
 
@@ -627,7 +627,7 @@ mcf_vcl_load(struct cli *cli, const char * const *av, void *priv)
 }
 
 
-static void __match_proto__(cli_func_t)
+static void v_matchproto_(cli_func_t)
 mcf_vcl_state(struct cli *cli, const char * const *av, void *priv)
 {
 	struct vclprog *vp;
@@ -674,7 +674,7 @@ mcf_vcl_state(struct cli *cli, const char * const *av, void *priv)
 	}
 }
 
-static void __match_proto__(cli_func_t)
+static void v_matchproto_(cli_func_t)
 mcf_vcl_use(struct cli *cli, const char * const *av, void *priv)
 {
 	unsigned status;
@@ -707,7 +707,7 @@ mcf_vcl_use(struct cli *cli, const char * const *av, void *priv)
 	free(p);
 }
 
-static void __match_proto__(cli_func_t)
+static void v_matchproto_(cli_func_t)
 mcf_vcl_discard(struct cli *cli, const char * const *av, void *priv)
 {
 	unsigned status;
@@ -757,7 +757,7 @@ mcf_vcl_discard(struct cli *cli, const char * const *av, void *priv)
 	mgt_vcl_del(vp);
 }
 
-static void __match_proto__(cli_func_t)
+static void v_matchproto_(cli_func_t)
 mcf_vcl_list(struct cli *cli, const char * const *av, void *priv)
 {
 	unsigned status;
@@ -799,7 +799,7 @@ mcf_vcl_list(struct cli *cli, const char * const *av, void *priv)
 	}
 }
 
-static void __match_proto__(cli_func_t)
+static void v_matchproto_(cli_func_t)
 mcf_vcl_label(struct cli *cli, const char * const *av, void *priv)
 {
 	struct vclprog *vpl;
@@ -870,7 +870,7 @@ mcf_vcl_label(struct cli *cli, const char * const *av, void *priv)
 
 /*--------------------------------------------------------------------*/
 
-static int __match_proto__(vev_cb_f)
+static int v_matchproto_(vev_cb_f)
 mgt_vcl_poker(const struct vev *e, int what)
 {
 	struct vclprog *vp;
diff --git a/bin/varnishd/proxy/cache_proxy_proto.c b/bin/varnishd/proxy/cache_proxy_proto.c
index b25347f..1ec3a6b 100644
--- a/bin/varnishd/proxy/cache_proxy_proto.c
+++ b/bin/varnishd/proxy/cache_proxy_proto.c
@@ -288,7 +288,7 @@ vpx_proto2(const struct worker *wrk, struct req *req)
  * HTC_Rx completion detector
  */
 
-static enum htc_status_e __match_proto__(htc_complete_f)
+static enum htc_status_e v_matchproto_(htc_complete_f)
 vpx_complete(struct http_conn *htc)
 {
 	int i, l, j;
@@ -331,7 +331,7 @@ vpx_complete(struct http_conn *htc)
 	return (HTC_S_MORE);
 }
 
-static void __match_proto__(task_func_t)
+static void v_matchproto_(task_func_t)
 vpx_new_session(struct worker *wrk, void *arg)
 {
 	struct req *req;
diff --git a/bin/varnishd/storage/mgt_stevedore.c b/bin/varnishd/storage/mgt_stevedore.c
index ef44695..8ebfca2 100644
--- a/bin/varnishd/storage/mgt_stevedore.c
+++ b/bin/varnishd/storage/mgt_stevedore.c
@@ -69,7 +69,7 @@ STV__iter(struct stevedore ** const pp)
 
 /*--------------------------------------------------------------------*/
 
-static void __match_proto__(cli_func_t)
+static void v_matchproto_(cli_func_t)
 stv_cli_list(struct cli *cli, const char * const *av, void *priv)
 {
 	struct stevedore *stv;
@@ -92,7 +92,7 @@ static struct cli_proto cli_stv[] = {
 /*--------------------------------------------------------------------
  */
 
-static void __match_proto__(storage_init_f)
+static void v_matchproto_(storage_init_f)
 smp_fake_init(struct stevedore *parent, int ac, char * const *av)
 {
 
diff --git a/bin/varnishd/storage/stevedore.c b/bin/varnishd/storage/stevedore.c
index c9e80f6..49835eb 100644
--- a/bin/varnishd/storage/stevedore.c
+++ b/bin/varnishd/storage/stevedore.c
@@ -199,7 +199,7 @@ VRT_Stv(const char *nm)
 	return (0);
 }
 
-const char * __match_proto__()
+const char * v_matchproto_()
 VRT_STEVEDORE_string(VCL_STEVEDORE s)
 {
 	if (s == NULL)
diff --git a/bin/varnishd/storage/storage_file.c b/bin/varnishd/storage/storage_file.c
index c3fbd9f..285a62d 100644
--- a/bin/varnishd/storage/storage_file.c
+++ b/bin/varnishd/storage/storage_file.c
@@ -401,7 +401,7 @@ smf_open_chunk(struct smf_sc *sc, off_t sz, off_t off, off_t *fail, off_t *sum)
 	smf_open_chunk(sc, sz - h, off + h, fail, sum);
 }
 
-static void __match_proto__(storage_open_f)
+static void v_matchproto_(storage_open_f)
 smf_open(struct stevedore *st)
 {
 	struct smf_sc *sc;
@@ -430,7 +430,7 @@ smf_open(struct stevedore *st)
 
 /*--------------------------------------------------------------------*/
 
-static struct storage * __match_proto__(sml_alloc_f)
+static struct storage * v_matchproto_(sml_alloc_f)
 smf_alloc(const struct stevedore *st, size_t size)
 {
 	struct smf *smf;
@@ -466,7 +466,7 @@ smf_alloc(const struct stevedore *st, size_t size)
 
 /*--------------------------------------------------------------------*/
 
-static void __match_proto__(sml_free_f)
+static void v_matchproto_(sml_free_f)
 smf_free(struct storage *s)
 {
 	struct smf *smf;
diff --git a/bin/varnishd/storage/storage_lru.c b/bin/varnishd/storage/storage_lru.c
index 6ebff17..cc84b97 100644
--- a/bin/varnishd/storage/storage_lru.c
+++ b/bin/varnishd/storage/storage_lru.c
@@ -120,7 +120,7 @@ LRU_Remove(struct objcore *oc)
 	Lck_Unlock(&lru->mtx);
 }
 
-void __match_proto__(objtouch_f)
+void v_matchproto_(objtouch_f)
 LRU_Touch(struct worker *wrk, struct objcore *oc, double now)
 {
 	struct lru *lru;
diff --git a/bin/varnishd/storage/storage_malloc.c b/bin/varnishd/storage/storage_malloc.c
index 9fe13b5..e82217e 100644
--- a/bin/varnishd/storage/storage_malloc.c
+++ b/bin/varnishd/storage/storage_malloc.c
@@ -63,7 +63,7 @@ struct sma {
 
 static struct VSC_lck *lck_sma;
 
-static struct storage * __match_proto__(sml_alloc_f)
+static struct storage * v_matchproto_(sml_alloc_f)
 sma_alloc(const struct stevedore *st, size_t size)
 {
 	struct sma_sc *sma_sc;
@@ -129,7 +129,7 @@ sma_alloc(const struct stevedore *st, size_t size)
 	return (&sma->s);
 }
 
-static void __match_proto__(sml_free_f)
+static void v_matchproto_(sml_free_f)
 sma_free(struct storage *s)
 {
 	struct sma_sc *sma_sc;
@@ -151,7 +151,7 @@ sma_free(struct storage *s)
 	free(sma);
 }
 
-static VCL_BYTES __match_proto__(stv_var_used_space)
+static VCL_BYTES v_matchproto_(stv_var_used_space)
 sma_used_space(const struct stevedore *st)
 {
 	struct sma_sc *sma_sc;
@@ -160,7 +160,7 @@ sma_used_space(const struct stevedore *st)
 	return (sma_sc->sma_alloc);
 }
 
-static VCL_BYTES __match_proto__(stv_var_free_space)
+static VCL_BYTES v_matchproto_(stv_var_free_space)
 sma_free_space(const struct stevedore *st)
 {
 	struct sma_sc *sma_sc;
@@ -202,7 +202,7 @@ sma_init(struct stevedore *parent, int ac, char * const *av)
 	sc->sma_max = u;
 }
 
-static void __match_proto__(storage_open_f)
+static void v_matchproto_(storage_open_f)
 sma_open(struct stevedore *st)
 {
 	struct sma_sc *sma_sc;
diff --git a/bin/varnishd/storage/storage_persistent.c b/bin/varnishd/storage/storage_persistent.c
index bfc082a..59af759 100644
--- a/bin/varnishd/storage/storage_persistent.c
+++ b/bin/varnishd/storage/storage_persistent.c
@@ -276,7 +276,7 @@ smp_open_segs(struct smp_sc *sc, struct smp_signspace *spc)
  * Silo worker thread
  */
 
-static void * __match_proto__(bgthread_t)
+static void * v_matchproto_(bgthread_t)
 smp_thread(struct worker *wrk, void *priv)
 {
 	struct smp_sc	*sc;
@@ -319,7 +319,7 @@ smp_thread(struct worker *wrk, void *priv)
  * Open a silo in the worker process
  */
 
-static void __match_proto__(storage_open_f)
+static void v_matchproto_(storage_open_f)
 smp_open(struct stevedore *st)
 {
 	struct smp_sc	*sc;
@@ -388,7 +388,7 @@ smp_open(struct stevedore *st)
  * Close a silo
  */
 
-static void __match_proto__(storage_close_f)
+static void v_matchproto_(storage_close_f)
 smp_close(const struct stevedore *st, int warn)
 {
 	struct smp_sc	*sc;
@@ -502,7 +502,7 @@ smp_allocx(const struct stevedore *st, size_t min_size, size_t max_size,
  * Allocate an object
  */
 
-static int __match_proto__(storage_allocobj_f)
+static int v_matchproto_(storage_allocobj_f)
 smp_allocobj(struct worker *wrk, const struct stevedore *stv,
     struct objcore *oc, unsigned wsl)
 {
@@ -578,7 +578,7 @@ smp_allocobj(struct worker *wrk, const struct stevedore *stv,
  * Allocate a bite
  */
 
-static struct storage * __match_proto__(sml_alloc_f)
+static struct storage * v_matchproto_(sml_alloc_f)
 smp_alloc(const struct stevedore *st, size_t size)
 {
 
@@ -630,7 +630,7 @@ debug_report_silo(struct cli *cli, const struct smp_sc *sc)
 	}
 }
 
-static void __match_proto__(cli_func_t)
+static void v_matchproto_(cli_func_t)
 debug_persistent(struct cli *cli, const char * const * av, void *priv)
 {
 	struct smp_sc *sc;
diff --git a/bin/varnishd/storage/storage_persistent_silo.c b/bin/varnishd/storage/storage_persistent_silo.c
index 6718065..aa38315 100644
--- a/bin/varnishd/storage/storage_persistent_silo.c
+++ b/bin/varnishd/storage/storage_persistent_silo.c
@@ -390,7 +390,7 @@ smp_loaded_st(const struct smp_sc *sc, const struct smp_seg *sg,
  * objcore methods for persistent objects
  */
 
-struct object * __match_proto__(sml_getobj_f)
+struct object * v_matchproto_(sml_getobj_f)
 smp_sml_getobj(struct worker *wrk, struct objcore *oc)
 {
 	struct object *o;
@@ -454,7 +454,7 @@ smp_sml_getobj(struct worker *wrk, struct objcore *oc)
 	return (o);
 }
 
-void __match_proto__(objfree_f)
+void v_matchproto_(objfree_f)
 smp_oc_objfree(struct worker *wrk, struct objcore *oc)
 {
 	struct smp_seg *sg;
@@ -498,7 +498,7 @@ smp_init_oc(struct objcore *oc, struct smp_seg *sg, unsigned objidx)
 
 /*--------------------------------------------------------------------*/
 
-void __match_proto__(obj_event_f)
+void v_matchproto_(obj_event_f)
 smp_oc_event(struct worker *wrk, void *priv, struct objcore *oc, unsigned ev)
 {
 	struct stevedore *st;
diff --git a/bin/varnishd/storage/storage_simple.c b/bin/varnishd/storage/storage_simple.c
index 38e21f2..776f5f7 100644
--- a/bin/varnishd/storage/storage_simple.c
+++ b/bin/varnishd/storage/storage_simple.c
@@ -125,7 +125,7 @@ SML_MkObject(const struct stevedore *stv, struct objcore *oc, void *ptr)
  * implement persistent storage can rely on.
  */
 
-int __match_proto__(storage_allocobj_f)
+int v_matchproto_(storage_allocobj_f)
 SML_allocobj(struct worker *wrk, const struct stevedore *stv,
     struct objcore *oc, unsigned wsl)
 {
@@ -180,7 +180,7 @@ sml_getobj(struct worker *wrk, struct objcore *oc)
 	return (o);
 }
 
-static void __match_proto__(objslim_f)
+static void v_matchproto_(objslim_f)
 sml_slim(struct worker *wrk, struct objcore *oc)
 {
 	const struct stevedore *stv;
@@ -208,7 +208,7 @@ sml_slim(struct worker *wrk, struct objcore *oc)
 	}
 }
 
-static void __match_proto__(objfree_f)
+static void v_matchproto_(objfree_f)
 sml_objfree(struct worker *wrk, struct objcore *oc)
 {
 	struct object *o;
@@ -229,7 +229,7 @@ sml_objfree(struct worker *wrk, struct objcore *oc)
 	wrk->stats->n_object--;
 }
 
-static int __match_proto__(objiterate_f)
+static int v_matchproto_(objiterate_f)
 sml_iterator(struct worker *wrk, struct objcore *oc,
     void *priv, objiterate_f *func, int final)
 {
@@ -365,7 +365,7 @@ objallocwithnuke(struct worker *wrk, const struct stevedore *stv, size_t size,
 	return (st);
 }
 
-static int __match_proto__(objgetspace_f)
+static int v_matchproto_(objgetspace_f)
 sml_getspace(struct worker *wrk, struct objcore *oc, ssize_t *sz,
     uint8_t **ptr)
 {
@@ -405,7 +405,7 @@ sml_getspace(struct worker *wrk, struct objcore *oc, ssize_t *sz,
 	return (1);
 }
 
-static void __match_proto__(objextend_f)
+static void v_matchproto_(objextend_f)
 sml_extend(struct worker *wrk, struct objcore *oc, ssize_t l)
 {
 	struct object *o;
@@ -422,7 +422,7 @@ sml_extend(struct worker *wrk, struct objcore *oc, ssize_t l)
 	st->len += l;
 }
 
-static void __match_proto__(objtrimstore_f)
+static void v_matchproto_(objtrimstore_f)
 sml_trimstore(struct worker *wrk, struct objcore *oc)
 {
 	const struct stevedore *stv;
@@ -473,7 +473,7 @@ sml_trimstore(struct worker *wrk, struct objcore *oc)
 	oc->boc->stevedore_priv = st;
 }
 
-static void __match_proto__(objbocdone_f)
+static void v_matchproto_(objbocdone_f)
 sml_bocdone(struct worker *wrk, struct objcore *oc, struct boc *boc)
 {
 	const struct stevedore *stv;
@@ -500,7 +500,7 @@ sml_bocdone(struct worker *wrk, struct objcore *oc, struct boc *boc)
 	}
 }
 
-static const void * __match_proto__(objgetattr_f)
+static const void * v_matchproto_(objgetattr_f)
 sml_getattr(struct worker *wrk, struct objcore *oc, enum obj_attr attr,
    ssize_t *len)
 {
@@ -547,7 +547,7 @@ sml_getattr(struct worker *wrk, struct objcore *oc, enum obj_attr attr,
 	WRONG("Unsupported OBJ_ATTR");
 }
 
-static void * __match_proto__(objsetattr_f)
+static void * v_matchproto_(objsetattr_f)
 sml_setattr(struct worker *wrk, struct objcore *oc, enum obj_attr attr,
     ssize_t len, const void *ptr)
 {
diff --git a/bin/varnishd/storage/storage_umem.c b/bin/varnishd/storage/storage_umem.c
index 23244e1..0510412 100644
--- a/bin/varnishd/storage/storage_umem.c
+++ b/bin/varnishd/storage/storage_umem.c
@@ -82,7 +82,7 @@ smu_smu_init(struct smu *smu, struct smu_sc *sc)
 	smu->sc = sc;
 }
 
-static int __match_proto__(umem_constructor_t)
+static int v_matchproto_(umem_constructor_t)
 smu_smu_constructor(void *buffer, void *callback_data, int flags)
 {
 	struct smu *smu = buffer;
@@ -94,7 +94,7 @@ smu_smu_constructor(void *buffer, void *callback_data, int flags)
 	return (0);
 }
 
-static void __match_proto__(umem_destructor_t)
+static void v_matchproto_(umem_destructor_t)
 	smu_smu_destructor(void *buffer, void *callback_data)
 {
 	struct smu *smu;
@@ -109,7 +109,7 @@ static void __match_proto__(umem_destructor_t)
 
 static struct VSC_lck *lck_smu;
 
-static struct storage * __match_proto__(sml_alloc_f)
+static struct storage * v_matchproto_(sml_alloc_f)
 smu_alloc(const struct stevedore *st, size_t size)
 {
 	struct smu_sc *smu_sc;
@@ -172,7 +172,7 @@ smu_alloc(const struct stevedore *st, size_t size)
 	return (&smu->s);
 }
 
-static void __match_proto__(sml_free_f)
+static void v_matchproto_(sml_free_f)
 smu_free(struct storage *s)
 {
 	struct smu *smu;
@@ -196,7 +196,7 @@ smu_free(struct storage *s)
 	umem_cache_free(sc->smu_cache, smu);
 }
 
-static VCL_BYTES __match_proto__(stv_var_used_space)
+static VCL_BYTES v_matchproto_(stv_var_used_space)
 smu_used_space(const struct stevedore *st)
 {
 	struct smu_sc *smu_sc;
@@ -205,7 +205,7 @@ smu_used_space(const struct stevedore *st)
 	return (smu_sc->smu_alloc);
 }
 
-static VCL_BYTES __match_proto__(stv_var_free_space)
+static VCL_BYTES v_matchproto_(stv_var_free_space)
 smu_free_space(const struct stevedore *st)
 {
 	struct smu_sc *smu_sc;
@@ -247,7 +247,7 @@ smu_init(struct stevedore *parent, int ac, char * const *av)
 	sc->smu_max = u;
 }
 
-static void __match_proto__(storage_open_f)
+static void v_matchproto_(storage_open_f)
 smu_open(struct stevedore *st)
 {
 	struct smu_sc *smu_sc;
@@ -275,7 +275,7 @@ smu_open(struct stevedore *st)
 	AN(smu_sc->smu_cache);
 }
 
-static void __match_proto__(storage_close_f)
+static void v_matchproto_(storage_close_f)
 smu_close(const struct stevedore *st, int warn)
 {
 	struct smu_sc *smu_sc;
diff --git a/bin/varnishd/waiter/cache_waiter.c b/bin/varnishd/waiter/cache_waiter.c
index f4ec53b..fc31642 100644
--- a/bin/varnishd/waiter/cache_waiter.c
+++ b/bin/varnishd/waiter/cache_waiter.c
@@ -40,7 +40,7 @@
 #include "waiter/waiter_priv.h"
 #include "waiter/mgt_waiter.h"
 
-static int __match_proto__(binheap_cmp_t)
+static int v_matchproto_(binheap_cmp_t)
 waited_cmp(void *priv, const void *a, const void *b)
 {
 	const struct waiter *ww;
@@ -53,7 +53,7 @@ waited_cmp(void *priv, const void *a, const void *b)
 	return (Wait_When(aa) < Wait_When(bb));
 }
 
-static void __match_proto__(binheap_update_t)
+static void v_matchproto_(binheap_update_t)
 waited_update(void *priv, void *p, unsigned u)
 {
 	struct waited *pp;
diff --git a/bin/varnishd/waiter/cache_waiter_epoll.c b/bin/varnishd/waiter/cache_waiter_epoll.c
index cede609..9e2e2a3 100644
--- a/bin/varnishd/waiter/cache_waiter_epoll.c
+++ b/bin/varnishd/waiter/cache_waiter_epoll.c
@@ -154,7 +154,7 @@ vwe_thread(void *priv)
 
 /*--------------------------------------------------------------------*/
 
-static int __match_proto__(waiter_enter_f)
+static int v_matchproto_(waiter_enter_f)
 vwe_enter(void *priv, struct waited *wp)
 {
 	struct vwe *vwe;
@@ -176,7 +176,7 @@ vwe_enter(void *priv, struct waited *wp)
 
 /*--------------------------------------------------------------------*/
 
-static void __match_proto__(waiter_init_f)
+static void v_matchproto_(waiter_init_f)
 vwe_init(struct waiter *w)
 {
 	struct vwe *vwe;
@@ -203,7 +203,7 @@ vwe_init(struct waiter *w)
  * fail somehow.
  */
 
-static void __match_proto__(waiter_fini_f)
+static void v_matchproto_(waiter_fini_f)
 vwe_fini(struct waiter *w)
 {
 	struct vwe *vwe;
diff --git a/bin/varnishd/waiter/cache_waiter_kqueue.c b/bin/varnishd/waiter/cache_waiter_kqueue.c
index 00b1e3b..8ab242e 100644
--- a/bin/varnishd/waiter/cache_waiter_kqueue.c
+++ b/bin/varnishd/waiter/cache_waiter_kqueue.c
@@ -136,7 +136,7 @@ vwk_thread(void *priv)
 
 /*--------------------------------------------------------------------*/
 
-static int __match_proto__(waiter_enter_f)
+static int v_matchproto_(waiter_enter_f)
 vwk_enter(void *priv, struct waited *wp)
 {
 	struct vwk *vwk;
@@ -159,7 +159,7 @@ vwk_enter(void *priv, struct waited *wp)
 
 /*--------------------------------------------------------------------*/
 
-static void __match_proto__(waiter_init_f)
+static void v_matchproto_(waiter_init_f)
 vwk_init(struct waiter *w)
 {
 	struct vwk *vwk;
@@ -185,7 +185,7 @@ vwk_init(struct waiter *w)
  * fail somehow.
  */
 
-static void __match_proto__(waiter_fini_f)
+static void v_matchproto_(waiter_fini_f)
 vwk_fini(struct waiter *w)
 {
 	struct vwk *vwk;
diff --git a/bin/varnishd/waiter/cache_waiter_poll.c b/bin/varnishd/waiter/cache_waiter_poll.c
index 363db64..74c65ac 100644
--- a/bin/varnishd/waiter/cache_waiter_poll.c
+++ b/bin/varnishd/waiter/cache_waiter_poll.c
@@ -211,7 +211,7 @@ vwp_main(void *priv)
 
 /*--------------------------------------------------------------------*/
 
-static int __match_proto__(waiter_enter_f)
+static int v_matchproto_(waiter_enter_f)
 vwp_enter(void *priv, struct waited *wp)
 {
 	struct vwp *vwp;
@@ -225,7 +225,7 @@ vwp_enter(void *priv, struct waited *wp)
 
 /*--------------------------------------------------------------------*/
 
-static void __match_proto__(waiter_init_f)
+static void v_matchproto_(waiter_init_f)
 vwp_init(struct waiter *w)
 {
 	struct vwp *vwp;
@@ -249,7 +249,7 @@ vwp_init(struct waiter *w)
  * fail somehow.
  */
 
-static void __match_proto__(waiter_fini_f)
+static void v_matchproto_(waiter_fini_f)
 vwp_fini(struct waiter *w)
 {
 	struct vwp *vwp;
diff --git a/bin/varnishd/waiter/cache_waiter_ports.c b/bin/varnishd/waiter/cache_waiter_ports.c
index 428e8e4..4846488 100644
--- a/bin/varnishd/waiter/cache_waiter_ports.c
+++ b/bin/varnishd/waiter/cache_waiter_ports.c
@@ -233,7 +233,7 @@ vws_enter(void *priv, struct waited *wp)
 
 /*--------------------------------------------------------------------*/
 
-static void __match_proto__(waiter_init_f)
+static void v_matchproto_(waiter_init_f)
 vws_init(struct waiter *w)
 {
 	struct vws *vws;
@@ -250,7 +250,7 @@ vws_init(struct waiter *w)
 
 /*--------------------------------------------------------------------*/
 
-static void __match_proto__(waiter_fini_f)
+static void v_matchproto_(waiter_fini_f)
 vws_fini(struct waiter *w)
 {
 	struct vws *vws;
diff --git a/bin/varnishhist/varnishhist.c b/bin/varnishhist/varnishhist.c
index 4770249..1fed3cb 100644
--- a/bin/varnishhist/varnishhist.c
+++ b/bin/varnishhist/varnishhist.c
@@ -219,7 +219,7 @@ upd_vsl_ts(const char *p)
 		vsl_ts = t;
 }
 
-static int __match_proto__ (VSLQ_dispatch_f)
+static int v_matchproto_ (VSLQ_dispatch_f)
 accumulate(struct VSL_data *vsl, struct VSL_transaction * const pt[],
     void *priv)
 {
@@ -368,7 +368,7 @@ accumulate(struct VSL_data *vsl, struct VSL_transaction * const pt[],
 	return (0);
 }
 
-static int __match_proto__(VUT_cb_f)
+static int v_matchproto_(VUT_cb_f)
 sighup(struct VUT *v)
 {
 	assert(v == vut);
@@ -376,7 +376,7 @@ sighup(struct VUT *v)
 	return (1);
 }
 
-static void * __match_proto__(pthread_t)
+static void * v_matchproto_(pthread_t)
 do_curses(void *arg)
 {
 	int ch;
@@ -468,7 +468,7 @@ do_curses(void *arg)
 
 /*--------------------------------------------------------------------*/
 
-static void __attribute__((__noreturn__))
+static void v_noreturn_
 usage(int status)
 {
 	const char **opt;
diff --git a/bin/varnishlog/varnishlog.c b/bin/varnishlog/varnishlog.c
index e0a4846..b714f54 100644
--- a/bin/varnishlog/varnishlog.c
+++ b/bin/varnishlog/varnishlog.c
@@ -43,11 +43,12 @@
 #define VOPT_DEFINITION
 #define VOPT_INC "varnishlog_options.h"
 
+#include "vdef.h"
+
 #include "vapi/vsm.h"
 #include "vapi/vsl.h"
 #include "vapi/voptget.h"
 #include "vas.h"
-#include "vdef.h"
 #include "vut.h"
 #include "miniobj.h"
 
@@ -63,7 +64,7 @@ static struct log {
 	FILE		*fo;
 } LOG;
 
-static void __attribute__((__noreturn__))
+static void v_noreturn_
 usage(int status)
 {
 	const char **opt;
@@ -89,7 +90,7 @@ openout(int append)
 	vut->dispatch_priv = LOG.fo;
 }
 
-static int __match_proto__(VUT_cb_f)
+static int v_matchproto_(VUT_cb_f)
 rotateout(struct VUT *v)
 {
 
@@ -102,7 +103,7 @@ rotateout(struct VUT *v)
 	return (0);
 }
 
-static int __match_proto__(VUT_cb_f)
+static int v_matchproto_(VUT_cb_f)
 flushout(struct VUT *v)
 {
 
@@ -113,7 +114,7 @@ flushout(struct VUT *v)
 	return (0);
 }
 
-static int __match_proto__(VUT_cb_f)
+static int v_matchproto_(VUT_cb_f)
 sighup(struct VUT *v)
 {
 	assert(v == vut);
diff --git a/bin/varnishncsa/varnishncsa.c b/bin/varnishncsa/varnishncsa.c
index cc5cb05..6870ab3 100644
--- a/bin/varnishncsa/varnishncsa.c
+++ b/bin/varnishncsa/varnishncsa.c
@@ -57,11 +57,12 @@
 #define VOPT_DEFINITION
 #define VOPT_INC "varnishncsa_options.h"
 
+#include "vdef.h"
+
 #include "b64.h"
 #include "vapi/vsl.h"
 #include "vapi/voptget.h"
 #include "vas.h"
-#include "vdef.h"
 #include "vsb.h"
 #include "vut.h"
 #include "vqueue.h"
@@ -161,7 +162,7 @@ static struct ctx {
 	int32_t			vxid;
 } CTX;
 
-static void __attribute__((__noreturn__))
+static void v_noreturn_
 usage(int status)
 {
 	const char **opt;
@@ -184,7 +185,7 @@ openout(int append)
 		    strerror(errno));
 }
 
-static int __match_proto__(VUT_cb_f)
+static int v_matchproto_(VUT_cb_f)
 rotateout(struct VUT *v)
 {
 
@@ -197,7 +198,7 @@ rotateout(struct VUT *v)
 	return (0);
 }
 
-static int __match_proto__(VUT_cb_f)
+static int v_matchproto_(VUT_cb_f)
 flushout(struct VUT *v)
 {
 
@@ -266,7 +267,7 @@ vsb_fcat(struct vsb *vsb, const struct fragment *f, const char *dflt)
 	return (-1);
 }
 
-static int __match_proto__(format_f)
+static int v_matchproto_(format_f)
 format_string(const struct format *format)
 {
 
@@ -276,7 +277,7 @@ format_string(const struct format *format)
 	return (1);
 }
 
-static int __match_proto__(format_f)
+static int v_matchproto_(format_f)
 format_strptr(const struct format *format)
 {
 
@@ -287,7 +288,7 @@ format_strptr(const struct format *format)
 	return (1);
 }
 
-static int __match_proto__(format_f)
+static int v_matchproto_(format_f)
 format_int32(const struct format *format)
 {
 
@@ -296,7 +297,7 @@ format_int32(const struct format *format)
 	return (1);
 }
 
-static int __match_proto__(format_f)
+static int v_matchproto_(format_f)
 format_fragment(const struct format *format)
 {
 
@@ -314,7 +315,7 @@ format_fragment(const struct format *format)
 	return (1);
 }
 
-static int __match_proto__(format_f)
+static int v_matchproto_(format_f)
 format_time(const struct format *format)
 {
 	double t_start, t_end;
@@ -368,7 +369,7 @@ format_time(const struct format *format)
 	return (1);
 }
 
-static int __match_proto__(format_f)
+static int v_matchproto_(format_f)
 format_requestline(const struct format *format)
 {
 
@@ -388,7 +389,7 @@ format_requestline(const struct format *format)
 	return (1);
 }
 
-static int __match_proto__(format_f)
+static int v_matchproto_(format_f)
 format_auth(const struct format *format)
 {
 	char buf[128];
@@ -922,7 +923,7 @@ process_vsl(const struct vsl_watch_head *head, enum VSL_tag_e tag,
 	}
 }
 
-static int __match_proto__(VSLQ_dispatch_f)
+static int v_matchproto_(VSLQ_dispatch_f)
 dispatch_f(struct VSL_data *vsl, struct VSL_transaction * const pt[],
     void *priv)
 {
@@ -1107,7 +1108,7 @@ dispatch_f(struct VSL_data *vsl, struct VSL_transaction * const pt[],
 	return (0);
 }
 
-static int __match_proto__(VUT_cb_f)
+static int v_matchproto_(VUT_cb_f)
 sighup(struct VUT *v)
 {
 	assert(v == vut);
diff --git a/bin/varnishstat/varnishstat.c b/bin/varnishstat/varnishstat.c
index 5b31ee9..1f37397 100644
--- a/bin/varnishstat/varnishstat.c
+++ b/bin/varnishstat/varnishstat.c
@@ -55,7 +55,7 @@ static struct VUT *vut;
 
 /*--------------------------------------------------------------------*/
 
-static int __match_proto__(VSC_iter_f)
+static int v_matchproto_(VSC_iter_f)
 do_xml_cb(void *priv, const struct VSC_point * const pt)
 {
 	uint64_t val;
@@ -93,7 +93,7 @@ do_xml(struct vsm *vsm, struct vsc *vsc)
 
 /*--------------------------------------------------------------------*/
 
-static int __match_proto__(VSC_iter_f)
+static int v_matchproto_(VSC_iter_f)
 do_json_cb(void *priv, const struct VSC_point * const pt)
 {
 	uint64_t val;
@@ -152,7 +152,7 @@ struct once_priv {
 	int pad;
 };
 
-static int __match_proto__(VSC_iter_f)
+static int v_matchproto_(VSC_iter_f)
 do_once_cb_first(void *priv, const struct VSC_point * const pt)
 {
 	struct once_priv *op;
@@ -169,7 +169,7 @@ do_once_cb_first(void *priv, const struct VSC_point * const pt)
 	return (1);
 }
 
-static int __match_proto__(VSC_iter_f)
+static int v_matchproto_(VSC_iter_f)
 do_once_cb(void *priv, const struct VSC_point * const pt)
 {
 	struct once_priv *op;
@@ -210,7 +210,7 @@ do_once(struct vsm *vsm, struct vsc *vsc)
 
 /*--------------------------------------------------------------------*/
 
-static int __match_proto__(VSC_iter_f)
+static int v_matchproto_(VSC_iter_f)
 do_list_cb(void *priv, const struct VSC_point * const pt)
 {
 	int i;
@@ -240,7 +240,7 @@ list_fields(struct vsm *vsm, struct vsc *vsc)
 
 /*--------------------------------------------------------------------*/
 
-static void __attribute__((__noreturn__))
+static void v_noreturn_
 usage(int status)
 {
 	const char **opt;
diff --git a/bin/varnishstat/varnishstat_curses.c b/bin/varnishstat/varnishstat_curses.c
index 3f2b792..0dfacd1 100644
--- a/bin/varnishstat/varnishstat_curses.c
+++ b/bin/varnishstat/varnishstat_curses.c
@@ -928,7 +928,7 @@ handle_keypress(int ch)
 	redraw = 1;
 }
 
-static void * __match_proto__(VSC_new_f)
+static void * v_matchproto_(VSC_new_f)
 newpt(void *priv, const struct VSC_point *const vpt)
 {
 	struct pt *pt;
@@ -958,7 +958,7 @@ newpt(void *priv, const struct VSC_point *const vpt)
 	return (pt);
 }
 
-static void __match_proto__(VSC_destroy_f)
+static void v_matchproto_(VSC_destroy_f)
 delpt(void *priv, const struct VSC_point *const vpt)
 {
 	struct pt *pt;
diff --git a/bin/varnishtest/vtc.h b/bin/varnishtest/vtc.h
index 996b199..52e12e5 100644
--- a/bin/varnishtest/vtc.h
+++ b/bin/varnishtest/vtc.h
@@ -35,9 +35,10 @@
 #include <pthread_np.h>
 #endif
 
+#include "vdef.h"
+
 #include "miniobj.h"
 #include "vas.h"
-#include "vdef.h"
 #include "vqueue.h"
 #include "vsb.h"
 
@@ -102,9 +103,9 @@ void vtc_loginit(char *buf, unsigned buflen);
 struct vtclog *vtc_logopen(const char *id);
 void vtc_logclose(struct vtclog *vl);
 void vtc_log(struct vtclog *vl, int lvl, const char *fmt, ...)
-    __v_printflike(3, 4);
+    v_printflike_(3, 4);
 void vtc_fatal(struct vtclog *vl, const char *, ...)
-    __attribute__((__noreturn__)) __v_printflike(2,3);
+    v_noreturn_ v_printflike_(2,3);
 void vtc_dump(struct vtclog *vl, int lvl, const char *pfx,
     const char *str, int len);
 void vtc_hexdump(struct vtclog *, int , const char *, const void *, int );
@@ -118,11 +119,11 @@ int exec_file(const char *fn, const char *script, const char *tmpdir,
 void macro_undef(struct vtclog *vl, const char *instance, const char *name);
 void macro_def(struct vtclog *vl, const char *instance, const char *name,
     const char *fmt, ...)
-    __v_printflike(4, 5);
+    v_printflike_(4, 5);
 struct vsb *macro_expand(struct vtclog *vl, const char *text);
 
 void extmacro_def(const char *name, const char *fmt, ...)
-    __v_printflike(2, 3);
+    v_printflike_(2, 3);
 
 struct http;
 void cmd_stream(CMD_ARGS);
diff --git a/bin/varnishtest/vtc_client.c b/bin/varnishtest/vtc_client.c
index 4515282..c4d4ad8 100644
--- a/bin/varnishtest/vtc_client.c
+++ b/bin/varnishtest/vtc_client.c
@@ -68,7 +68,7 @@ static VTAILQ_HEAD(, client)	clients =
  * Send the proxy header
  */
 
-static int __match_proto__(vss_resolved_f)
+static int v_matchproto_(vss_resolved_f)
 proxy_cb(void *priv, const struct suckaddr *sa)
 {
 	struct suckaddr **addr = priv;
diff --git a/bin/varnishtest/vtc_h2_hpack.c b/bin/varnishtest/vtc_h2_hpack.c
index f986d2f..9e30bf8 100644
--- a/bin/varnishtest/vtc_h2_hpack.c
+++ b/bin/varnishtest/vtc_h2_hpack.c
@@ -30,7 +30,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <vas.h>
+
+#include "vdef.h"
+
+#include "vas.h"
 
 #include "hpack.h"
 #include "vtc_h2_priv.h"
diff --git a/bin/varnishtest/vtc_h2_tbl.c b/bin/varnishtest/vtc_h2_tbl.c
index cfb18b8..c0262af 100644
--- a/bin/varnishtest/vtc_h2_tbl.c
+++ b/bin/varnishtest/vtc_h2_tbl.c
@@ -31,7 +31,9 @@
 #include <stdio.h>
 #include <stdint.h>
 
-#include <vas.h>
+#include "vdef.h"
+
+#include "vas.h"
 
 #include "hpack.h"
 #include "vtc_h2_priv.h"
diff --git a/bin/varnishtest/vtc_log.c b/bin/varnishtest/vtc_log.c
index a764d1f..72108b1 100644
--- a/bin/varnishtest/vtc_log.c
+++ b/bin/varnishtest/vtc_log.c
@@ -101,7 +101,7 @@ vtc_logclose(struct vtclog *vl)
 	FREE_OBJ(vl);
 }
 
-static void __attribute__((__noreturn__))
+static void v_noreturn_
 vtc_logfail(void)
 {
 
@@ -267,7 +267,7 @@ vtc_hexdump(struct vtclog *vl, int lvl, const char *pfx,
 
 /**********************************************************************/
 
-static void __attribute__((__noreturn__))
+static void v_noreturn_
 vtc_log_VAS_Fail(const char *func, const char *file, int line,
     const char *cond, enum vas_e why)
 {
diff --git a/bin/varnishtest/vtc_logexp.c b/bin/varnishtest/vtc_logexp.c
index 7f7d054..5b983f1 100644
--- a/bin/varnishtest/vtc_logexp.c
+++ b/bin/varnishtest/vtc_logexp.c
@@ -252,7 +252,7 @@ logexp_next(struct logexp *le)
 		vtc_log(le->vl, 3, "expecting| %s", VSB_data(le->test->str));
 }
 
-static int __match_proto__(VSLQ_dispatch_f)
+static int v_matchproto_(VSLQ_dispatch_f)
 logexp_dispatch(struct VSL_data *vsl, struct VSL_transaction * const pt[],
     void *priv)
 {
diff --git a/bin/varnishtest/vtc_main.c b/bin/varnishtest/vtc_main.c
index 0d4982d..71ef165 100644
--- a/bin/varnishtest/vtc_main.c
+++ b/bin/varnishtest/vtc_main.c
@@ -432,7 +432,7 @@ i_mode(void)
  * DNS services.  This is a basic sanity check for those.
  */
 
-static int __match_proto__(vss_resolved_f)
+static int v_matchproto_(vss_resolved_f)
 dns_cb(void *priv, const struct suckaddr *sa)
 {
 	char abuf[VTCP_ADDRBUFSIZE];
@@ -464,7 +464,7 @@ dns_works(void)
  * Figure out what IP related magic
  */
 
-static int __match_proto__(vss_resolved_f)
+static int v_matchproto_(vss_resolved_f)
 bind_cb(void *priv, const struct suckaddr *sa)
 {
 	(void)priv;
diff --git a/bin/varnishtop/varnishtop.c b/bin/varnishtop/varnishtop.c
index 8dfa516..332bc0e 100644
--- a/bin/varnishtop/varnishtop.c
+++ b/bin/varnishtop/varnishtop.c
@@ -46,13 +46,14 @@
 #define VOPT_DEFINITION
 #define VOPT_INC "varnishtop_options.h"
 
+#include "vdef.h"
+
 #include "miniobj.h"
 #include "vcurses.h"
 #include "vapi/vsl.h"
 #include "vapi/vsm.h"
 #include "vapi/voptget.h"
 #include "vas.h"
-#include "vdef.h"
 #include "vtree.h"
 #include "vut.h"
 
@@ -115,7 +116,7 @@ VRB_GENERATE_STATIC(t_order, top, e_order, cmp_order)
 VRB_PROTOTYPE_STATIC(t_key, top, e_key, cmp_key)
 VRB_GENERATE_STATIC(t_key, top, e_key, cmp_key)
 
-static int __match_proto__(VSLQ_dispatch_f)
+static int v_matchproto_(VSLQ_dispatch_f)
 accumulate(struct VSL_data *vsl, struct VSL_transaction * const pt[],
 	void *priv)
 {
@@ -181,7 +182,7 @@ accumulate(struct VSL_data *vsl, struct VSL_transaction * const pt[],
 	return (0);
 }
 
-static int __match_proto__(VUT_cb_f)
+static int v_matchproto_(VUT_cb_f)
 sighup(struct VUT *v)
 {
 	assert(v == vut);
@@ -324,7 +325,7 @@ dump(void)
 }
 
 //lint -sem(usage, r_no)
-static void __attribute__((__noreturn__))
+static void v_noreturn_
 usage(int status)
 {
 	const char **opt;
diff --git a/include/Makefile.am b/include/Makefile.am
index 9fb1da1..5bec5a5 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -99,9 +99,13 @@ nobase_noinst_HEADERS = \
 	vtcp.h \
 	vtree.h
 
-vmod_abi.h: $(top_srcdir)/lib/libvcc/generate.py $(top_srcdir)/include/vrt.h
+vmod_abi.h: \
+	    $(top_srcdir)/lib/libvcc/generate.py \
+	    $(top_srcdir)/include/vdef.h \
+	    $(top_srcdir)/include/vrt.h
 	mkdir -p tbl
-	@PYTHON@ $(top_srcdir)/lib/libvcc/generate.py $(top_srcdir) $(top_builddir)
+	@PYTHON@ $(top_srcdir)/lib/libvcc/generate.py \
+	    $(top_srcdir) $(top_builddir)
 
 GEN_H = \
 	tbl/vrt_stv_var.h \
diff --git a/include/vas.h b/include/vas.h
index 76bcb75..11c0069 100644
--- a/include/vas.h
+++ b/include/vas.h
@@ -48,8 +48,8 @@ enum vas_e {
 
 typedef void vas_f(const char *, const char *, int, const char *, enum vas_e);
 
-extern vas_f *VAS_Fail_Func __attribute__((__noreturn__));
-extern vas_f VAS_Fail __attribute__((__noreturn__));
+extern vas_f *VAS_Fail_Func v_noreturn_;
+extern vas_f VAS_Fail v_noreturn_;
 
 #ifdef WITHOUT_ASSERTS
 #define assert(e)	((void)(e))
diff --git a/include/vcli_serve.h b/include/vcli_serve.h
index 67a1792..7bc04c3 100644
--- a/include/vcli_serve.h
+++ b/include/vcli_serve.h
@@ -82,7 +82,7 @@ struct cli {
 
 /* The implementation must provide these functions */
 int VCLI_Overflow(struct cli *cli);
-void VCLI_Out(struct cli *cli, const char *fmt, ...) __v_printflike(2, 3);
+void VCLI_Out(struct cli *cli, const char *fmt, ...) v_printflike_(2, 3);
 void VCLI_Quote(struct cli *cli, const char *str);
 void VCLI_JSON_str(struct cli *cli, const char *str);
 void VCLI_JSON_ver(struct cli *cli, unsigned ver, const char * const * av);
diff --git a/include/vdef.h b/include/vdef.h
index 4ab9e73..1852657 100644
--- a/include/vdef.h
+++ b/include/vdef.h
@@ -30,6 +30,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
+ * Names of the form "v_[a-z_]*_" is reserved for this file.
+ *
+ * This file should always be the first non <...> include in a .c file.
  */
 
 #ifdef VDEF_H_INCLUDED
@@ -71,13 +74,15 @@
 #endif
 
 #ifdef __printflike
-#  define __v_printflike(f,a) __printflike(f,a)
+#  define v_printflike_(f,a) __printflike(f,a)
 #elif __GNUC_PREREQ__(2, 95) || defined(__INTEL_COMPILER)
-#  define __v_printflike(f,a) __attribute__((format(printf, f, a)))
+#  define v_printflike_(f,a) __attribute__((format(printf, f, a)))
 #else
-#  define __v_printflike(f,a)
+#  define v_printflike_(f,a)
 #endif
 
+#define v_noreturn_ __attribute__((__noreturn__))
+
 /*********************************************************************
  * Pointer alignment magic
  */
@@ -114,13 +119,13 @@
  * even if that means not const'ing a const'able argument.
  * The typedef should be specified as argument to the macro.
  */
-#define __match_proto__(xxx)		/*lint --e{818} */
+#define v_matchproto_(xxx)		/*lint --e{818} */
 
 /*
  * State variables may change value before we have considered the
  * previous value
  */
-#define __state_variable__(varname)	varname /*lint -esym(838,varname) */
+#define v_statevariable_(varname)	varname /*lint -esym(838,varname) */
 
 #ifdef __SUNPRO_C
 #define NEEDLESS(s)		{}
@@ -128,12 +133,10 @@
 #define NEEDLESS(s)		s
 #endif
 
-#ifndef __unused
-#  if __GNUC_PREREQ__(2, 7)
-#    define __unused __attribute__((__unused__))
-#  else
-#    define __unused
-#  endif
+#if __GNUC_PREREQ__(2, 7)
+#  define v_unused_ __attribute__((__unused__))
+#else
+#  define v_unused_
 #endif
 
 /*
@@ -160,5 +163,5 @@
 #   endif
 #   define __Static_assert(x, y)	___Static_assert(x, y)
 #   define ___Static_assert(x, y) \
-		typedef char __assert_## y[(x) ? 1 : -1] __unused
+		typedef char __assert_## y[(x) ? 1 : -1] v_unused_
 #endif
diff --git a/include/vrt.h b/include/vrt.h
index 76aae7e..fef0c9d 100644
--- a/include/vrt.h
+++ b/include/vrt.h
@@ -356,7 +356,7 @@ void VRT_hit_for_pass(VRT_CTX, VCL_DURATION);
 
 void VRT_SetHdr(VRT_CTX, const struct gethdr_s *, const char *, ...);
 void VRT_handling(VRT_CTX, unsigned hand);
-void VRT_fail(VRT_CTX, const char *fmt, ...) __v_printflike(2,3);
+void VRT_fail(VRT_CTX, const char *fmt, ...) v_printflike_(2,3);
 
 void VRT_hashdata(VRT_CTX, const char *str, ...);
 
diff --git a/include/vsb.h b/include/vsb.h
index 3f66897..d510884 100644
--- a/include/vsb.h
+++ b/include/vsb.h
@@ -64,10 +64,10 @@ void		 VSB_clear(struct vsb *);
 int		 VSB_bcat(struct vsb *, const void *, ssize_t);
 int		 VSB_cat(struct vsb *, const char *);
 int		 VSB_printf(struct vsb *, const char *, ...)
-	__v_printflike(2, 3);
+	v_printflike_(2, 3);
 #ifdef va_start
 int		 VSB_vprintf(struct vsb *, const char *, va_list)
-	__v_printflike(2, 0);
+	v_printflike_(2, 0);
 #endif
 int		 VSB_putc(struct vsb *, int);
 int		 VSB_error(const struct vsb *);
diff --git a/include/vtree.h b/include/vtree.h
index 93323ab..649e822 100644
--- a/include/vtree.h
+++ b/include/vtree.h
@@ -379,7 +379,7 @@ struct {								\
 #define	VRB_PROTOTYPE(name, type, field, cmp)				\
 	VRB_PROTOTYPE_INTERNAL(name, type, field, cmp,)
 #define	VRB_PROTOTYPE_STATIC(name, type, field, cmp)			\
-	VRB_PROTOTYPE_INTERNAL(name, type, field, cmp, __unused static)
+	VRB_PROTOTYPE_INTERNAL(name, type, field, cmp, v_unused_ static)
 #define VRB_PROTOTYPE_INTERNAL(name, type, field, cmp, attr)		\
 /*lint -esym(528, name##_VRB_*) */					\
 attr void name##_VRB_INSERT_COLOR(struct name *, struct type *);	\
@@ -399,7 +399,7 @@ attr struct type *name##_VRB_MINMAX(const struct name *, int);		\
 #define	VRB_GENERATE(name, type, field, cmp)				\
 	VRB_GENERATE_INTERNAL(name, type, field, cmp,)
 #define	VRB_GENERATE_STATIC(name, type, field, cmp)			\
-	VRB_GENERATE_INTERNAL(name, type, field, cmp, __unused static)
+	VRB_GENERATE_INTERNAL(name, type, field, cmp, v_unused_ static)
 #define VRB_GENERATE_INTERNAL(name, type, field, cmp, attr)		\
 attr void								\
 name##_VRB_INSERT_COLOR(struct name *head, struct type *elm)		\
diff --git a/include/vut.h b/include/vut.h
index 0d731cf..9b8c25c 100644
--- a/include/vut.h
+++ b/include/vut.h
@@ -69,7 +69,7 @@ struct VUT {
 };
 
 void VUT_Error(struct VUT *, int status, const char *fmt, ...)
-    __v_printflike(3, 4);
+    v_printflike_(3, 4);
 
 int VUT_Arg(struct VUT *, int opt, const char *arg);
 
diff --git a/lib/libvarnish/binary_heap.c b/lib/libvarnish/binary_heap.c
index 322d412..d537c94 100644
--- a/lib/libvarnish/binary_heap.c
+++ b/lib/libvarnish/binary_heap.c
@@ -40,6 +40,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
+#include "vdef.h"
 #include "vas.h"
 #include "binary_heap.h"
 
@@ -462,7 +463,6 @@ binheap_reorder(const struct binheap *bh, unsigned idx)
 #include <stdio.h>
 #include <string.h>
 
-#include "vdef.h"
 #include "vrnd.h"
 #include "miniobj.h"
 
@@ -482,7 +482,7 @@ struct foo {
 
 struct foo *ff[N];
 
-static int __match_proto__(binheap_cmp_t)
+static int v_matchproto_(binheap_cmp_t)
 cmp(void *priv, const void *a, const void *b)
 {
 	const struct foo *fa, *fb;
@@ -493,7 +493,7 @@ cmp(void *priv, const void *a, const void *b)
 	return (fa->key < fb->key);
 }
 
-static void __match_proto__(binheap_update_t)
+static void v_matchproto_(binheap_update_t)
 update(void *priv, void *a, unsigned u)
 {
 	struct foo *fa;
diff --git a/lib/libvarnish/vas.c b/lib/libvarnish/vas.c
index 3d7f631..8380df9 100644
--- a/lib/libvarnish/vas.c
+++ b/lib/libvarnish/vas.c
@@ -36,11 +36,13 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "vdef.h"
+
 #include "vas.h"
 
-vas_f *VAS_Fail_Func __attribute__((__noreturn__));
+vas_f *VAS_Fail_Func v_noreturn_;
 
-void __attribute__((__noreturn__))
+void v_noreturn_
 VAS_Fail(const char *func, const char *file, int line,
     const char *cond, enum vas_e kind)
 {
diff --git a/lib/libvarnish/vav.c b/lib/libvarnish/vav.c
index 4c4a779..f1bc3db 100644
--- a/lib/libvarnish/vav.c
+++ b/lib/libvarnish/vav.c
@@ -43,6 +43,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "vdef.h"
+
 #include "vas.h"
 #include "vav.h"
 
diff --git a/lib/libvarnish/vcli_proto.c b/lib/libvarnish/vcli_proto.c
index 3f0b165..789c08d 100644
--- a/lib/libvarnish/vcli_proto.c
+++ b/lib/libvarnish/vcli_proto.c
@@ -39,6 +39,8 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "vdef.h"
+
 #include "vas.h"	// XXX Flexelint "not used" - but req'ed for assert()
 #include "vcli.h"
 #include "vsha256.h"
diff --git a/lib/libvarnish/vcli_serve.c b/lib/libvarnish/vcli_serve.c
index 33de8f3..689553d 100644
--- a/lib/libvarnish/vcli_serve.c
+++ b/lib/libvarnish/vcli_serve.c
@@ -79,7 +79,7 @@ struct VCLS {
 
 /*--------------------------------------------------------------------*/
 
-void __match_proto__(cli_func_t)
+void v_matchproto_(cli_func_t)
 VCLS_func_close(struct cli *cli, const char *const *av, void *priv)
 {
 
@@ -91,7 +91,7 @@ VCLS_func_close(struct cli *cli, const char *const *av, void *priv)
 
 /*--------------------------------------------------------------------*/
 
-void __match_proto__(cli_func_t)
+void v_matchproto_(cli_func_t)
 VCLS_func_ping(struct cli *cli, const char * const *av, void *priv)
 {
 	time_t t;
@@ -104,7 +104,7 @@ VCLS_func_ping(struct cli *cli, const char * const *av, void *priv)
 
 /*--------------------------------------------------------------------*/
 
-void __match_proto__(cli_func_t)
+void v_matchproto_(cli_func_t)
 VCLS_func_help(struct cli *cli, const char * const *av, void *priv)
 {
 	struct cli_proto *clp;
@@ -149,7 +149,7 @@ VCLS_func_help(struct cli *cli, const char * const *av, void *priv)
 	}
 }
 
-void __match_proto__(cli_func_t)
+void v_matchproto_(cli_func_t)
 VCLS_func_help_json(struct cli *cli, const char * const *av, void *priv)
 {
 	struct cli_proto *clp;
diff --git a/lib/libvarnish/vct.c b/lib/libvarnish/vct.c
index 087a9ca..8d36b10 100644
--- a/lib/libvarnish/vct.c
+++ b/lib/libvarnish/vct.c
@@ -34,6 +34,8 @@
 #include <stdint.h>
 #include <string.h>
 
+#include "vdef.h"
+
 #include "vas.h"
 #include "vct.h"
 
diff --git a/lib/libvarnish/vev.c b/lib/libvarnish/vev.c
index d04a80f..ac69754 100644
--- a/lib/libvarnish/vev.c
+++ b/lib/libvarnish/vev.c
@@ -92,7 +92,7 @@ struct vev_root {
 
 /*--------------------------------------------------------------------*/
 
-static void __match_proto__(binheap_update_t)
+static void v_matchproto_(binheap_update_t)
 vev_bh_update(void *priv, void *a, unsigned u)
 {
 	struct vev_root *evb;
@@ -110,7 +110,7 @@ vev_bh_update(void *priv, void *a, unsigned u)
 	}
 }
 
-static int __match_proto__(binheap_cmp_t)
+static int v_matchproto_(binheap_cmp_t)
 vev_bh_cmp(void *priv, const void *a, const void *b)
 {
 	struct vev_root *evb;
diff --git a/lib/libvarnish/vin.c b/lib/libvarnish/vin.c
index 5a3d948..6dac9d2 100644
--- a/lib/libvarnish/vin.c
+++ b/lib/libvarnish/vin.c
@@ -38,8 +38,9 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "vas.h"	// XXX Flexelint "not used" - but req'ed for assert()
 #include "vdef.h"
+
+#include "vas.h"	// XXX Flexelint "not used" - but req'ed for assert()
 #include "vin.h"
 
 int
diff --git a/lib/libvarnish/vlu.c b/lib/libvarnish/vlu.c
index a636804..2ae654e 100644
--- a/lib/libvarnish/vlu.c
+++ b/lib/libvarnish/vlu.c
@@ -34,6 +34,8 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "vdef.h"
+
 #include "vas.h"	// XXX Flexelint "not used" - but req'ed for assert()
 #include "miniobj.h"
 
diff --git a/lib/libvarnish/vnum.c b/lib/libvarnish/vnum.c
index 14ba022..6caf931 100644
--- a/lib/libvarnish/vnum.c
+++ b/lib/libvarnish/vnum.c
@@ -36,6 +36,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "vdef.h"
+
 #include "vnum.h"
 #include "vas.h"
 
diff --git a/lib/libvarnish/vpf.c b/lib/libvarnish/vpf.c
index 3da5748..5626b9e 100644
--- a/lib/libvarnish/vpf.c
+++ b/lib/libvarnish/vpf.c
@@ -40,6 +40,8 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "vdef.h"
+
 #include "vas.h"	// XXX Flexelint "not used" - but req'ed for assert()
 #include "vfl.h"
 #include "vpf.h"
diff --git a/lib/libvarnish/vre.c b/lib/libvarnish/vre.c
index 61469d1..42047aa 100644
--- a/lib/libvarnish/vre.c
+++ b/lib/libvarnish/vre.c
@@ -31,6 +31,8 @@
 #include <pcre.h>
 #include <string.h>
 
+#include "vdef.h"
+
 #include "vas.h"	// XXX Flexelint "not used" - but req'ed for assert()
 #include "miniobj.h"
 
diff --git a/lib/libvarnish/vrnd.c b/lib/libvarnish/vrnd.c
index e38f0a7..3dc8b18 100644
--- a/lib/libvarnish/vrnd.c
+++ b/lib/libvarnish/vrnd.c
@@ -40,8 +40,9 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "vas.h"
 #include "vdef.h"
+
+#include "vas.h"
 #include "vrnd.h"
 
 /**********************************************************************
diff --git a/lib/libvarnish/vsha256.c b/lib/libvarnish/vsha256.c
index 7836179..73efb0b 100644
--- a/lib/libvarnish/vsha256.c
+++ b/lib/libvarnish/vsha256.c
@@ -43,6 +43,8 @@
 #include <stdint.h>
 #include <string.h>
 
+#include "vdef.h"
+
 #include "vas.h"
 #include "vend.h"
 #include "vsha256.h"
diff --git a/lib/libvarnish/vss.c b/lib/libvarnish/vss.c
index 1f8af2a..29c66be 100644
--- a/lib/libvarnish/vss.c
+++ b/lib/libvarnish/vss.c
@@ -36,6 +36,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "vdef.h"
+
 #include "vas.h"
 #include "vsa.h"
 #include "vss.h"
diff --git a/lib/libvarnish/vsub.c b/lib/libvarnish/vsub.c
index 48f56d7..2792ebc 100644
--- a/lib/libvarnish/vsub.c
+++ b/lib/libvarnish/vsub.c
@@ -39,8 +39,9 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "vas.h"
 #include "vdef.h"
+
+#include "vas.h"
 #include "vfil.h"
 #include "vlu.h"
 #include "vsb.h"
diff --git a/lib/libvarnish/vtcp.c b/lib/libvarnish/vtcp.c
index 2a4c25f..fb320ce 100644
--- a/lib/libvarnish/vtcp.c
+++ b/lib/libvarnish/vtcp.c
@@ -369,7 +369,7 @@ VTCP_set_read_timeout(int s, double seconds)
 /*--------------------------------------------------------------------
  */
 
-static int __match_proto__(vss_resolved_f)
+static int v_matchproto_(vss_resolved_f)
 vtcp_open_callback(void *priv, const struct suckaddr *sa)
 {
 	double *p = priv;
@@ -491,7 +491,7 @@ struct helper {
 	const char	**errp;
 };
 
-static int __match_proto__(vss_resolved_f)
+static int v_matchproto_(vss_resolved_f)
 vtcp_lo_cb(void *priv, const struct suckaddr *sa)
 {
 	int sock;
diff --git a/lib/libvarnish/vtim.c b/lib/libvarnish/vtim.c
index b2d47dd..4ef9058 100644
--- a/lib/libvarnish/vtim.c
+++ b/lib/libvarnish/vtim.c
@@ -65,6 +65,8 @@
 #include <mach/mach_time.h>
 #endif
 
+#include "vdef.h"
+
 #include "vas.h"
 #include "vtim.h"
 
diff --git a/lib/libvarnishapi/vjsn.c b/lib/libvarnishapi/vjsn.c
index c189a68..1859673 100644
--- a/lib/libvarnishapi/vjsn.c
+++ b/lib/libvarnishapi/vjsn.c
@@ -36,6 +36,8 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include "vdef.h"
+
 #include "vas.h"
 #include "miniobj.h"
 #include "vqueue.h"
diff --git a/lib/libvarnishapi/vsl.c b/lib/libvarnishapi/vsl.c
index 361a2bf..a028423 100644
--- a/lib/libvarnishapi/vsl.c
+++ b/lib/libvarnishapi/vsl.c
@@ -317,7 +317,7 @@ VSL_PrintAll(struct VSL_data *vsl, const struct VSL_cursor *c, void *fo)
 	}
 }
 
-int __match_proto__(VSLQ_dispatch_f)
+int v_matchproto_(VSLQ_dispatch_f)
 VSL_PrintTransactions(struct VSL_data *vsl, struct VSL_transaction * const pt[],
     void *fo)
 {
@@ -456,7 +456,7 @@ VSL_WriteAll(struct VSL_data *vsl, const struct VSL_cursor *c, void *fo)
 	}
 }
 
-int __match_proto__(VSLQ_dispatch_f)
+int v_matchproto_(VSLQ_dispatch_f)
 VSL_WriteTransactions(struct VSL_data *vsl, struct VSL_transaction * const pt[],
     void *fo)
 {
diff --git a/lib/libvarnishapi/vsl_api.h b/lib/libvarnishapi/vsl_api.h
index 8aef719..95e4ace 100644
--- a/lib/libvarnishapi/vsl_api.h
+++ b/lib/libvarnishapi/vsl_api.h
@@ -32,7 +32,7 @@
 #define VSL_FILE_ID			"VSL"
 
 /*lint -esym(534, vsl_diag) */
-int vsl_diag(struct VSL_data *vsl, const char *fmt, ...) __v_printflike(2, 3);
+int vsl_diag(struct VSL_data *vsl, const char *fmt, ...) v_printflike_(2, 3);
 void vsl_vbm_bitset(int bit, void *priv);
 void vsl_vbm_bitclr(int bit, void *priv);
 
diff --git a/lib/libvarnishapi/vsl_arg.c b/lib/libvarnishapi/vsl_arg.c
index cd7c2b4..5d69798 100644
--- a/lib/libvarnishapi/vsl_arg.c
+++ b/lib/libvarnishapi/vsl_arg.c
@@ -203,14 +203,14 @@ VSLQ_Name2Grouping(const char *name, int l)
 	return (n);
 }
 
-void __match_proto__(VSL_tagfind_f)
+void v_matchproto_(VSL_tagfind_f)
 vsl_vbm_bitset(int bit, void *priv)
 {
 
 	vbit_set((struct vbitmap *)priv, bit);
 }
 
-void __match_proto__(VSL_tagfind_f)
+void v_matchproto_(VSL_tagfind_f)
 vsl_vbm_bitclr(int bit, void *priv)
 {
 
diff --git a/lib/libvarnishapi/vut.c b/lib/libvarnishapi/vut.c
index 4245db9..f4053f6 100644
--- a/lib/libvarnishapi/vut.c
+++ b/lib/libvarnishapi/vut.c
@@ -80,7 +80,7 @@ vut_vpf_remove(void)
 	}
 }
 
-static int __match_proto__(VSLQ_dispatch_f)
+static int v_matchproto_(VSLQ_dispatch_f)
 vut_dispatch(struct VSL_data *vsl, struct VSL_transaction * const trans[],
     void *priv)
 {
@@ -101,7 +101,7 @@ vut_dispatch(struct VSL_data *vsl, struct VSL_transaction * const trans[],
 }
 
 //lint -sem(vut_error, r_no)
-static void __attribute__((__noreturn__)) __match_proto__(VUT_error_f)
+static void v_noreturn_ v_matchproto_(VUT_error_f)
 vut_error(struct VUT *vut, int status, const char *fmt, va_list ap)
 {
 
diff --git a/lib/libvcc/vcc_acl.c b/lib/libvcc/vcc_acl.c
index 1c80487..374c886 100644
--- a/lib/libvcc/vcc_acl.c
+++ b/lib/libvcc/vcc_acl.c
@@ -358,7 +358,7 @@ vcc_acl_emit(struct vcc *tl, const char *name, const char *rname, int anon)
 	VCC_PrintCName(func, name, NULL);
 	AZ(VSB_finish(func));
 
-	Fh(tl, 0, "\nstatic int __match_proto__(acl_match_f)\n");
+	Fh(tl, 0, "\nstatic int v_matchproto_(acl_match_f)\n");
 	Fh(tl, 0, "%s(VRT_CTX, const VCL_IP p)\n", VSB_data(func));
 	Fh(tl, 0, "{\n");
 	Fh(tl, 0, "\tconst unsigned char *a;\n");
diff --git a/lib/libvcc/vcc_compile.c b/lib/libvcc/vcc_compile.c
index fcf1665..e07ee9b 100644
--- a/lib/libvcc/vcc_compile.c
+++ b/lib/libvcc/vcc_compile.c
@@ -71,7 +71,7 @@ struct method method_tab[] = {
 
 /*--------------------------------------------------------------------*/
 
-void * __match_proto__(TlAlloc)
+void * v_matchproto_(TlAlloc)
 TlAlloc(struct vcc *tl, unsigned len)
 {
 	void *p;
@@ -628,10 +628,10 @@ vcc_CompileSource(struct vcc *tl, struct source *sp)
 	Fh(tl, 1, "\n");
 	for (i = 1; i < VCL_MET_MAX; i++) {
 		Fh(tl, 1,
-		    "void __match_proto__(vcl_func_f) "
+		    "void v_matchproto_(vcl_func_f) "
 		    "VGC_function_%s(VRT_CTX);\n",
 		    method_tab[i].name);
-		Fc(tl, 1, "\nvoid __match_proto__(vcl_func_f)\n");
+		Fc(tl, 1, "\nvoid v_matchproto_(vcl_func_f)\n");
 		Fc(tl, 1,
 		    "VGC_function_%s(VRT_CTX)\n",
 		    method_tab[i].name);
diff --git a/lib/libvcc/vcc_compile.h b/lib/libvcc/vcc_compile.h
index 600bcb5..47e3033 100644
--- a/lib/libvcc/vcc_compile.h
+++ b/lib/libvcc/vcc_compile.h
@@ -255,11 +255,11 @@ struct inifin *New_IniFin(struct vcc *tl);
  * F -> Finish function
  */
 void Fh(const struct vcc *tl, int indent, const char *fmt, ...)
-    __v_printflike(3, 4);
+    v_printflike_(3, 4);
 void Fc(const struct vcc *tl, int indent, const char *fmt, ...)
-    __v_printflike(3, 4);
+    v_printflike_(3, 4);
 void Fb(const struct vcc *tl, int indent, const char *fmt, ...)
-    __v_printflike(3, 4);
+    v_printflike_(3, 4);
 void EncToken(struct vsb *sb, const struct token *t);
 int IsMethod(const struct token *t);
 void *TlAlloc(struct vcc *tl, unsigned len);
diff --git a/lib/libvcc/vcc_expr.c b/lib/libvcc/vcc_expr.c
index bbe3a16..a36932f 100644
--- a/lib/libvcc/vcc_expr.c
+++ b/lib/libvcc/vcc_expr.c
@@ -234,7 +234,7 @@ vcc_new_expr(void)
 
 static struct expr *
 vcc_mk_expr(vcc_type_t fmt, const char *str, ...)
-    __v_printflike(2, 3);
+    v_printflike_(2, 3);
 
 static struct expr *
 vcc_mk_expr(vcc_type_t fmt, const char *str, ...)
@@ -408,7 +408,7 @@ vcc_expr_tostring(struct vcc *tl, struct expr **e, vcc_type_t fmt)
 /*--------------------------------------------------------------------
  */
 
-static void __match_proto__(sym_expr_t)
+static void v_matchproto_(sym_expr_t)
 vcc_Eval_Regsub(struct vcc *tl, struct expr **e, const struct symbol *sym,
     vcc_type_t fmt)
 {
@@ -445,7 +445,7 @@ vcc_Eval_Regsub(struct vcc *tl, struct expr **e, const struct symbol *sym,
 /*--------------------------------------------------------------------
  */
 
-static void __match_proto__(sym_expr_t)
+static void v_matchproto_(sym_expr_t)
 vcc_Eval_BoolConst(struct vcc *tl, struct expr **e, const struct symbol *sym,
     vcc_type_t fmt)
 {
@@ -459,7 +459,7 @@ vcc_Eval_BoolConst(struct vcc *tl, struct expr **e, const struct symbol *sym,
 /*--------------------------------------------------------------------
  */
 
-void __match_proto__(sym_expr_t)
+void v_matchproto_(sym_expr_t)
 vcc_Eval_Handle(struct vcc *tl, struct expr **e, const struct symbol *sym,
     vcc_type_t fmt)
 {
@@ -481,7 +481,7 @@ vcc_Eval_Handle(struct vcc *tl, struct expr **e, const struct symbol *sym,
 /*--------------------------------------------------------------------
  */
 
-void __match_proto__(sym_expr_t)
+void v_matchproto_(sym_expr_t)
 vcc_Eval_Var(struct vcc *tl, struct expr **e, const struct symbol *sym,
     vcc_type_t fmt)
 {
@@ -723,7 +723,7 @@ vcc_Eval_Func(struct vcc *tl, const char *spec,
 /*--------------------------------------------------------------------
  */
 
-void __match_proto__(sym_expr_t)
+void v_matchproto_(sym_expr_t)
 vcc_Eval_SymFunc(struct vcc *tl, struct expr **e, const struct symbol *sym,
     vcc_type_t fmt)
 {
diff --git a/lib/libvcc/vcc_parse.c b/lib/libvcc/vcc_parse.c
index 722574d..2466431 100644
--- a/lib/libvcc/vcc_parse.c
+++ b/lib/libvcc/vcc_parse.c
@@ -248,7 +248,7 @@ vcc_ParseFunction(struct vcc *tl)
 		}
 		tl->curproc = vcc_AddProc(tl, tl->t);
 		Fh(tl, 0, "void %s(VRT_CTX);\n", sym->rname);
-		Fc(tl, 1, "\nvoid __match_proto__(vcl_func_t)\n");
+		Fc(tl, 1, "\nvoid v_matchproto_(vcl_func_t)\n");
 		Fc(tl, 1, "%s(VRT_CTX)\n", sym->rname);
 	}
 	vcc_NextToken(tl);
diff --git a/lib/libvcc/vcc_utils.c b/lib/libvcc/vcc_utils.c
index fe9f4fb..9db35bb 100644
--- a/lib/libvcc/vcc_utils.c
+++ b/lib/libvcc/vcc_utils.c
@@ -147,7 +147,7 @@ struct rss {
 	int			wrong;
 };
 
-static int __match_proto__(vss_resolved_f)
+static int v_matchproto_(vss_resolved_f)
 rs_callback(void *priv, const struct suckaddr *vsa)
 {
 	struct rss *rss;
diff --git a/lib/libvcc/vcc_var.c b/lib/libvcc/vcc_var.c
index ea69923..4058b4d 100644
--- a/lib/libvcc/vcc_var.c
+++ b/lib/libvcc/vcc_var.c
@@ -36,7 +36,7 @@
 
 /*--------------------------------------------------------------------*/
 
-void __match_proto__(sym_wildcard_t)
+void v_matchproto_(sym_wildcard_t)
 vcc_Var_Wildcard(struct vcc *tl, struct symbol *parent,
     const char *b, const char *e)
 {
diff --git a/lib/libvcc/vcc_xref.c b/lib/libvcc/vcc_xref.c
index 7a78db3..267c949 100644
--- a/lib/libvcc/vcc_xref.c
+++ b/lib/libvcc/vcc_xref.c
@@ -403,7 +403,7 @@ vcc_pnam(struct vcc *tl, const struct symbol *sym)
 	Fc(tl, 0, "%s", sym->name);
 }
 
-static void __match_proto__(symwalk_f)
+static void v_matchproto_(symwalk_f)
 vcc_xreftable(struct vcc *tl, const struct symbol *sym)
 {
 
diff --git a/lib/libvmod_blob/vmod_blob.c b/lib/libvmod_blob/vmod_blob.c
index 8beb982..a509b34 100644
--- a/lib/libvmod_blob/vmod_blob.c
+++ b/lib/libvmod_blob/vmod_blob.c
@@ -192,7 +192,7 @@ check_enc_case(VRT_CTX, VCL_ENUM encs, VCL_ENUM case_s, enum encoding enc,
 
 /* Objects */
 
-VCL_VOID __match_proto__(td_blob_blob__init)
+VCL_VOID v_matchproto_(td_blob_blob__init)
 vmod_blob__init(VRT_CTX, struct vmod_blob_blob **blobp, const char *vcl_name,
 		VCL_ENUM decs, const char *p, ...)
 {
@@ -251,7 +251,7 @@ vmod_blob__init(VRT_CTX, struct vmod_blob_blob **blobp, const char *vcl_name,
 	b->blob.len = len;
 }
 
-VCL_BLOB __match_proto__(td_blob_blob_get)
+VCL_BLOB v_matchproto_(td_blob_blob_get)
 vmod_blob_get(VRT_CTX, struct vmod_blob_blob *b)
 {
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
@@ -259,7 +259,7 @@ vmod_blob_get(VRT_CTX, struct vmod_blob_blob *b)
 	return &b->blob;
 }
 
-VCL_STRING __match_proto__(td_blob_blob_encode)
+VCL_STRING v_matchproto_(td_blob_blob_encode)
 vmod_blob_encode(VRT_CTX, struct vmod_blob_blob *b, VCL_ENUM encs,
 		 VCL_ENUM case_s)
 {
@@ -311,7 +311,7 @@ vmod_blob_encode(VRT_CTX, struct vmod_blob_blob *b, VCL_ENUM encs,
 	return b->encoding[enc][kase];
 }
 
-VCL_VOID __match_proto__(td_blob_blob__fini)
+VCL_VOID v_matchproto_(td_blob_blob__fini)
 vmod_blob__fini(struct vmod_blob_blob **blobp)
 {
 	struct vmod_blob_blob *b;
@@ -360,7 +360,7 @@ find_nonempty_va(const char *restrict *p, va_list ap)
 	return (q);
 }
 
-VCL_BLOB __match_proto__(td_blob_decode)
+VCL_BLOB v_matchproto_(td_blob_decode)
 vmod_decode(VRT_CTX, VCL_ENUM decs, VCL_INT length, const char *p, ...)
 {
 	enum encoding dec = parse_encoding(decs);
@@ -447,7 +447,7 @@ encode(VRT_CTX, enum encoding enc, enum case_e kase, VCL_BLOB b)
 	return wb_finish(&wb, NULL);
 }
 
-VCL_STRING __match_proto__(td_blob_encode)
+VCL_STRING v_matchproto_(td_blob_encode)
 vmod_encode(VRT_CTX, VCL_ENUM encs, VCL_ENUM case_s, VCL_BLOB b)
 {
 	enum encoding enc = parse_encoding(encs);
@@ -459,7 +459,7 @@ vmod_encode(VRT_CTX, VCL_ENUM encs, VCL_ENUM case_s, VCL_BLOB b)
 	return encode(ctx, enc, kase, b);
 }
 
-VCL_STRING __match_proto__(td_blob_transcode)
+VCL_STRING v_matchproto_(td_blob_transcode)
 vmod_transcode(VRT_CTX, VCL_ENUM decs, VCL_ENUM encs, VCL_ENUM case_s,
 	       VCL_INT length, const char *p, ...)
 {
@@ -533,7 +533,7 @@ vmod_transcode(VRT_CTX, VCL_ENUM decs, VCL_ENUM encs, VCL_ENUM case_s,
 	return (r);
 }
 
-VCL_BOOL __match_proto__(td_blob_same)
+VCL_BOOL v_matchproto_(td_blob_same)
 vmod_same(VRT_CTX, VCL_BLOB b1, VCL_BLOB b2)
 {
 	(void) ctx;
@@ -545,7 +545,7 @@ vmod_same(VRT_CTX, VCL_BLOB b1, VCL_BLOB b2)
 	return (b1->len == b2->len && b1->priv == b2->priv);
 }
 
-VCL_BOOL __match_proto__(td_blob_equal)
+VCL_BOOL v_matchproto_(td_blob_equal)
 vmod_equal(VRT_CTX, VCL_BLOB b1, VCL_BLOB b2)
 {
 	(void) ctx;
@@ -563,7 +563,7 @@ vmod_equal(VRT_CTX, VCL_BLOB b1, VCL_BLOB b2)
 	return (memcmp(b1->priv, b2->priv, b1->len) == 0);
 }
 
-VCL_INT __match_proto__(td_blob_length)
+VCL_INT v_matchproto_(td_blob_length)
 vmod_length(VRT_CTX, VCL_BLOB b)
 {
 	(void) ctx;
@@ -573,7 +573,7 @@ vmod_length(VRT_CTX, VCL_BLOB b)
 	return b->len;
 }
 
-VCL_BLOB __match_proto__(td_blob_sub)
+VCL_BLOB v_matchproto_(td_blob_sub)
 vmod_sub(VRT_CTX, VCL_BLOB b, VCL_BYTES n, VCL_BYTES off)
 {
 	uintptr_t snap;
diff --git a/lib/libvmod_debug/vmod_debug.c b/lib/libvmod_debug/vmod_debug.c
index 3493578..f094fc9 100644
--- a/lib/libvmod_debug/vmod_debug.c
+++ b/lib/libvmod_debug/vmod_debug.c
@@ -68,7 +68,7 @@ static VCL_DURATION vcl_release_delay = 0.0;
 static pthread_mutex_t vsc_mtx = PTHREAD_MUTEX_INITIALIZER;
 static struct VSC_debug *vsc;
 
-VCL_VOID __match_proto__(td_debug_panic)
+VCL_VOID v_matchproto_(td_debug_panic)
 xyzzy_panic(VRT_CTX, const char *str, ...)
 {
 	va_list ap;
@@ -82,7 +82,7 @@ xyzzy_panic(VRT_CTX, const char *str, ...)
 	VAS_Fail("VCL", "", 0, b, VAS_VCL);
 }
 
-VCL_STRING __match_proto__(td_debug_author)
+VCL_STRING v_matchproto_(td_debug_author)
 xyzzy_author(VRT_CTX, VCL_ENUM person, VCL_ENUM someone)
 {
 	(void)someone;
@@ -99,7 +99,7 @@ xyzzy_author(VRT_CTX, VCL_ENUM person, VCL_ENUM someone)
 	WRONG("Illegal VMOD enum");
 }
 
-VCL_VOID __match_proto__(td_debug_test_priv_call)
+VCL_VOID v_matchproto_(td_debug_test_priv_call)
 xyzzy_test_priv_call(VRT_CTX, struct vmod_priv *priv)
 {
 
@@ -112,7 +112,7 @@ xyzzy_test_priv_call(VRT_CTX, struct vmod_priv *priv)
 	}
 }
 
-VCL_STRING __match_proto__(td_debug_test_priv_task)
+VCL_STRING v_matchproto_(td_debug_test_priv_task)
 xyzzy_test_priv_task(VRT_CTX, struct vmod_priv *priv, VCL_STRING s)
 {
 
@@ -134,7 +134,7 @@ xyzzy_test_priv_task(VRT_CTX, struct vmod_priv *priv, VCL_STRING s)
 	return (priv->priv);
 }
 
-VCL_STRING __match_proto__(td_debug_test_priv_top)
+VCL_STRING v_matchproto_(td_debug_test_priv_top)
 xyzzy_test_priv_top(VRT_CTX, struct vmod_priv *priv, VCL_STRING s)
 {
 
@@ -146,7 +146,7 @@ xyzzy_test_priv_top(VRT_CTX, struct vmod_priv *priv, VCL_STRING s)
 	return (priv->priv);
 }
 
-VCL_VOID __match_proto__(td_debug_test_priv_vcl)
+VCL_VOID v_matchproto_(td_debug_test_priv_vcl)
 xyzzy_test_priv_vcl(VRT_CTX, struct vmod_priv *priv)
 {
 	struct priv_vcl *priv_vcl;
@@ -167,7 +167,7 @@ xyzzy_no_backend(VRT_CTX)
 	return (NULL);
 }
 
-VCL_STEVEDORE __match_proto__(td_debug_no_stevedore)
+VCL_STEVEDORE v_matchproto_(td_debug_no_stevedore)
 xyzzy_no_stevedore(VRT_CTX)
 {
 
@@ -176,7 +176,7 @@ xyzzy_no_stevedore(VRT_CTX)
 	return (NULL);
 }
 
-VCL_VOID __match_proto__(td_debug_rot52)
+VCL_VOID v_matchproto_(td_debug_rot52)
 xyzzy_rot52(VRT_CTX, VCL_HTTP hp)
 {
 
@@ -186,7 +186,7 @@ xyzzy_rot52(VRT_CTX, VCL_HTTP hp)
 	http_PrintfHeader(hp, "Encrypted: ROT52");
 }
 
-VCL_STRING __match_proto__(td_debug_argtest)
+VCL_STRING v_matchproto_(td_debug_argtest)
 xyzzy_argtest(VRT_CTX, VCL_STRING one, VCL_REAL two, VCL_STRING three,
     VCL_STRING comma, VCL_INT four)
 {
@@ -196,14 +196,14 @@ xyzzy_argtest(VRT_CTX, VCL_STRING one, VCL_REAL two, VCL_STRING three,
 	return (WS_Copy(ctx->ws, buf, -1));
 }
 
-VCL_INT __match_proto__(td_debug_vre_limit)
+VCL_INT v_matchproto_(td_debug_vre_limit)
 xyzzy_vre_limit(VRT_CTX)
 {
 	(void)ctx;
 	return (cache_param->vre_limits.match);
 }
 
-static void __match_proto__(obj_event_f)
+static void v_matchproto_(obj_event_f)
 obj_cb(struct worker *wrk, void *priv, struct objcore *oc, unsigned event)
 {
 	const struct priv_vcl *priv_vcl;
@@ -223,7 +223,7 @@ obj_cb(struct worker *wrk, void *priv, struct objcore *oc, unsigned event)
 	    (intmax_t)(uintptr_t)oc);
 }
 
-VCL_VOID __match_proto__(td_debug_register_obj_events)
+VCL_VOID v_matchproto_(td_debug_register_obj_events)
 xyzzy_register_obj_events(VRT_CTX, struct vmod_priv *priv)
 {
 	struct priv_vcl *priv_vcl;
@@ -236,14 +236,14 @@ xyzzy_register_obj_events(VRT_CTX, struct vmod_priv *priv)
 	VSL(SLT_Debug, 0, "Subscribed to Object Events");
 }
 
-VCL_VOID __match_proto__(td_debug_fail)
+VCL_VOID v_matchproto_(td_debug_fail)
 xyzzy_fail(VRT_CTX)
 {
 
 	VRT_fail(ctx, "Forced failure");
 }
 
-static void __match_proto__(vmod_priv_free_f)
+static void v_matchproto_(vmod_priv_free_f)
 priv_vcl_free(void *priv)
 {
 	struct priv_vcl *priv_vcl;
@@ -347,7 +347,7 @@ event_cold(VRT_CTX, const struct vmod_priv *priv)
 	return (0);
 }
 
-int __match_proto__(vmod_event_f)
+int v_matchproto_(vmod_event_f)
 event_function(VRT_CTX, struct vmod_priv *priv, enum vcl_event_e e)
 {
 
@@ -363,7 +363,7 @@ event_function(VRT_CTX, struct vmod_priv *priv, enum vcl_event_e e)
 	}
 }
 
-VCL_VOID __match_proto__(td_debug_sleep)
+VCL_VOID v_matchproto_(td_debug_sleep)
 xyzzy_sleep(VRT_CTX, VCL_DURATION t)
 {
 
@@ -486,7 +486,7 @@ xyzzy_workspace_overflow(VRT_CTX, VCL_ENUM which)
 	WS_MarkOverflow(ws);
 }
 
-VCL_VOID __match_proto__(td_debug_vcl_release_delay)
+VCL_VOID v_matchproto_(td_debug_vcl_release_delay)
 xyzzy_vcl_release_delay(VRT_CTX, VCL_DURATION delay)
 {
 
@@ -495,7 +495,7 @@ xyzzy_vcl_release_delay(VRT_CTX, VCL_DURATION delay)
 	vcl_release_delay = delay;
 }
 
-VCL_BOOL __match_proto__(td_debug_match_acl)
+VCL_BOOL v_matchproto_(td_debug_match_acl)
 xyzzy_match_acl(VRT_CTX, VCL_ACL acl, VCL_IP ip)
 {
 
@@ -539,7 +539,7 @@ xyzzy_barrier_sync(VRT_CTX, VCL_STRING addr)
 	return (0);
 }
 
-VCL_VOID __match_proto__(td_debug_test_probe)
+VCL_VOID v_matchproto_(td_debug_test_probe)
 xyzzy_test_probe(VRT_CTX, VCL_PROBE probe, VCL_PROBE same)
 {
 
diff --git a/lib/libvmod_debug/vmod_debug_dyn.c b/lib/libvmod_debug/vmod_debug_dyn.c
index ad2dd29..ebd7330 100644
--- a/lib/libvmod_debug/vmod_debug_dyn.c
+++ b/lib/libvmod_debug/vmod_debug_dyn.c
@@ -150,7 +150,7 @@ xyzzy_dyn__fini(struct xyzzy_debug_dyn **dynp)
 	*dynp = NULL;
 }
 
-VCL_BACKEND __match_proto__()
+VCL_BACKEND v_matchproto_()
 xyzzy_dyn_backend(VRT_CTX, struct xyzzy_debug_dyn *dyn)
 {
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
diff --git a/lib/libvmod_debug/vmod_debug_obj.c b/lib/libvmod_debug/vmod_debug_obj.c
index 63f2e44..f053601 100644
--- a/lib/libvmod_debug/vmod_debug_obj.c
+++ b/lib/libvmod_debug/vmod_debug_obj.c
@@ -71,7 +71,7 @@ xyzzy_obj__fini(struct xyzzy_debug_obj **op)
 	*op = NULL;
 }
 
-VCL_VOID __match_proto__()
+VCL_VOID v_matchproto_()
 xyzzy_obj_enum(VRT_CTX, struct xyzzy_debug_obj *o, VCL_ENUM e)
 {
 
@@ -80,7 +80,7 @@ xyzzy_obj_enum(VRT_CTX, struct xyzzy_debug_obj *o, VCL_ENUM e)
 	assert(!strcmp(e, "martin"));
 }
 
-VCL_STRING __match_proto__()
+VCL_STRING v_matchproto_()
 xyzzy_obj_foo(VRT_CTX, struct xyzzy_debug_obj *o, VCL_STRING s)
 {
 
@@ -91,7 +91,7 @@ xyzzy_obj_foo(VRT_CTX, struct xyzzy_debug_obj *o, VCL_STRING s)
 	return ("BOO");
 }
 
-VCL_TIME __match_proto__()
+VCL_TIME v_matchproto_()
 xyzzy_obj_date(VRT_CTX, struct xyzzy_debug_obj *o)
 {
 
@@ -101,7 +101,7 @@ xyzzy_obj_date(VRT_CTX, struct xyzzy_debug_obj *o)
 	return (21.4);
 }
 
-VCL_STRING __match_proto__()
+VCL_STRING v_matchproto_()
 xyzzy_obj_string(VRT_CTX, struct xyzzy_debug_obj *o)
 {
 
@@ -111,7 +111,7 @@ xyzzy_obj_string(VRT_CTX, struct xyzzy_debug_obj *o)
 	return (o->string);
 }
 
-VCL_STRING __match_proto__()
+VCL_STRING v_matchproto_()
 xyzzy_obj_number(VRT_CTX, struct xyzzy_debug_obj *o)
 {
 
@@ -121,28 +121,28 @@ xyzzy_obj_number(VRT_CTX, struct xyzzy_debug_obj *o)
 	return (o->number);
 }
 
-VCL_VOID __match_proto__()
+VCL_VOID v_matchproto_()
 xyzzy_obj_test_priv_call(VRT_CTX,
     struct xyzzy_debug_obj *o, struct vmod_priv *priv)
 {
 	(void)o;
 	xyzzy_test_priv_call(ctx, priv);
 }
-VCL_VOID __match_proto__()
+VCL_VOID v_matchproto_()
 xyzzy_obj_test_priv_vcl(VRT_CTX,
     struct xyzzy_debug_obj *o, struct vmod_priv *priv)
 {
 	(void)o;
 	xyzzy_test_priv_vcl(ctx, priv);
 }
-VCL_STRING __match_proto__()
+VCL_STRING v_matchproto_()
 xyzzy_obj_test_priv_task(VRT_CTX,
     struct xyzzy_debug_obj *o, struct vmod_priv *priv, VCL_STRING s)
 {
 	(void)o;
 	return (xyzzy_test_priv_task(ctx, priv, s));
 }
-VCL_STRING __match_proto__()
+VCL_STRING v_matchproto_()
 xyzzy_obj_test_priv_top(VRT_CTX,
     struct xyzzy_debug_obj *o, struct vmod_priv *priv, VCL_STRING s)
 {
diff --git a/lib/libvmod_directors/fall_back.c b/lib/libvmod_directors/fall_back.c
index 1f32615..202431e 100644
--- a/lib/libvmod_directors/fall_back.c
+++ b/lib/libvmod_directors/fall_back.c
@@ -46,7 +46,7 @@ struct vmod_directors_fallback {
 	unsigned				cur;
 };
 
-static unsigned __match_proto__(vdi_healthy)
+static unsigned v_matchproto_(vdi_healthy)
 vmod_fallback_healthy(const struct director *dir, const struct busyobj *bo,
     double *changed)
 {
@@ -56,7 +56,7 @@ vmod_fallback_healthy(const struct director *dir, const struct busyobj *bo,
 	return (vdir_any_healthy(fb->vd, bo, changed));
 }
 
-static const struct director * __match_proto__(vdi_resolve_f)
+static const struct director * v_matchproto_(vdi_resolve_f)
 vmod_fallback_resolve(const struct director *dir, struct worker *wrk,
     struct busyobj *bo)
 {
@@ -86,7 +86,7 @@ vmod_fallback_resolve(const struct director *dir, struct worker *wrk,
 	return (be);
 }
 
-VCL_VOID __match_proto__()
+VCL_VOID v_matchproto_()
 vmod_fallback__init(VRT_CTX,
     struct vmod_directors_fallback **fbp, const char *vcl_name, VCL_BOOL sticky)
 {
@@ -103,7 +103,7 @@ vmod_fallback__init(VRT_CTX,
 	fb->st = sticky;
 }
 
-VCL_VOID __match_proto__()
+VCL_VOID v_matchproto_()
 vmod_fallback__fini(struct vmod_directors_fallback **fbp)
 {
 	struct vmod_directors_fallback *fb;
@@ -115,7 +115,7 @@ vmod_fallback__fini(struct vmod_directors_fallback **fbp)
 	FREE_OBJ(fb);
 }
 
-VCL_VOID __match_proto__()
+VCL_VOID v_matchproto_()
 vmod_fallback_add_backend(VRT_CTX,
     struct vmod_directors_fallback *fb, VCL_BACKEND be)
 {
@@ -125,7 +125,7 @@ vmod_fallback_add_backend(VRT_CTX,
 	vdir_add_backend(ctx, fb->vd, be, 0.0);
 }
 
-VCL_VOID __match_proto__()
+VCL_VOID v_matchproto_()
 vmod_fallback_remove_backend(VRT_CTX,
     struct vmod_directors_fallback *fb, VCL_BACKEND be)
 {
@@ -134,7 +134,7 @@ vmod_fallback_remove_backend(VRT_CTX,
 	vdir_remove_backend(ctx, fb->vd, be, &fb->cur);
 }
 
-VCL_BACKEND __match_proto__()
+VCL_BACKEND v_matchproto_()
 vmod_fallback_backend(VRT_CTX,
     struct vmod_directors_fallback *fb)
 {
diff --git a/lib/libvmod_directors/hash.c b/lib/libvmod_directors/hash.c
index 5e5fc97..80a792e 100644
--- a/lib/libvmod_directors/hash.c
+++ b/lib/libvmod_directors/hash.c
@@ -47,7 +47,7 @@ struct vmod_directors_hash {
 	struct vdir				*vd;
 };
 
-VCL_VOID __match_proto__()
+VCL_VOID v_matchproto_()
 vmod_hash__init(VRT_CTX, struct vmod_directors_hash **rrp,
     const char *vcl_name)
 {
@@ -62,7 +62,7 @@ vmod_hash__init(VRT_CTX, struct vmod_directors_hash **rrp,
 	vdir_new(&rr->vd, "hash", vcl_name, NULL, NULL, rr);
 }
 
-VCL_VOID __match_proto__()
+VCL_VOID v_matchproto_()
 vmod_hash__fini(struct vmod_directors_hash **rrp)
 {
 	struct vmod_directors_hash *rr;
@@ -74,7 +74,7 @@ vmod_hash__fini(struct vmod_directors_hash **rrp)
 	FREE_OBJ(rr);
 }
 
-VCL_VOID __match_proto__()
+VCL_VOID v_matchproto_()
 vmod_hash_add_backend(VRT_CTX,
     struct vmod_directors_hash *rr, VCL_BACKEND be, double w)
 {
@@ -84,7 +84,7 @@ vmod_hash_add_backend(VRT_CTX,
 	vdir_add_backend(ctx, rr->vd, be, w);
 }
 
-VCL_VOID __match_proto__()
+VCL_VOID v_matchproto_()
 vmod_hash_remove_backend(VRT_CTX,
     struct vmod_directors_hash *rr, VCL_BACKEND be)
 {
@@ -94,7 +94,7 @@ vmod_hash_remove_backend(VRT_CTX,
 	vdir_remove_backend(ctx, rr->vd, be, NULL);
 }
 
-VCL_BACKEND __match_proto__()
+VCL_BACKEND v_matchproto_()
 vmod_hash_backend(VRT_CTX, struct vmod_directors_hash *rr,
     const char *arg, ...)
 {
diff --git a/lib/libvmod_directors/random.c b/lib/libvmod_directors/random.c
index b2924db..91fb3ce 100644
--- a/lib/libvmod_directors/random.c
+++ b/lib/libvmod_directors/random.c
@@ -46,7 +46,7 @@ struct vmod_directors_random {
 	struct vdir				*vd;
 };
 
-static unsigned __match_proto__(vdi_healthy)
+static unsigned v_matchproto_(vdi_healthy)
 vmod_random_healthy(const struct director *dir, const struct busyobj *bo,
     double *changed)
 {
@@ -56,7 +56,7 @@ vmod_random_healthy(const struct director *dir, const struct busyobj *bo,
 	return (vdir_any_healthy(rr->vd, bo, changed));
 }
 
-static const struct director * __match_proto__(vdi_resolve_f)
+static const struct director * v_matchproto_(vdi_resolve_f)
 vmod_random_resolve(const struct director *dir, struct worker *wrk,
     struct busyobj *bo)
 {
@@ -74,7 +74,7 @@ vmod_random_resolve(const struct director *dir, struct worker *wrk,
 	return (be);
 }
 
-VCL_VOID __match_proto__()
+VCL_VOID v_matchproto_()
 vmod_random__init(VRT_CTX, struct vmod_directors_random **rrp,
     const char *vcl_name)
 {
@@ -90,7 +90,7 @@ vmod_random__init(VRT_CTX, struct vmod_directors_random **rrp,
 	    vmod_random_resolve, rr);
 }
 
-VCL_VOID __match_proto__()
+VCL_VOID v_matchproto_()
 vmod_random__fini(struct vmod_directors_random **rrp)
 {
 	struct vmod_directors_random *rr;
@@ -102,7 +102,7 @@ vmod_random__fini(struct vmod_directors_random **rrp)
 	FREE_OBJ(rr);
 }
 
-VCL_VOID __match_proto__()
+VCL_VOID v_matchproto_()
 vmod_random_add_backend(VRT_CTX,
     struct vmod_directors_random *rr, VCL_BACKEND be, double w)
 {
@@ -113,14 +113,14 @@ vmod_random_add_backend(VRT_CTX,
 }
 
 VCL_VOID vmod_random_remove_backend(VRT_CTX,
-    struct vmod_directors_random *rr, VCL_BACKEND be) __match_proto__()
+    struct vmod_directors_random *rr, VCL_BACKEND be) v_matchproto_()
 {
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
 	CHECK_OBJ_NOTNULL(rr, VMOD_DIRECTORS_RANDOM_MAGIC);
 	vdir_remove_backend(ctx, rr->vd, be, NULL);
 }
 
-VCL_BACKEND __match_proto__()
+VCL_BACKEND v_matchproto_()
 vmod_random_backend(VRT_CTX, struct vmod_directors_random *rr)
 {
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
diff --git a/lib/libvmod_directors/round_robin.c b/lib/libvmod_directors/round_robin.c
index 8b4a92e..3c896cb 100644
--- a/lib/libvmod_directors/round_robin.c
+++ b/lib/libvmod_directors/round_robin.c
@@ -45,7 +45,7 @@ struct vmod_directors_round_robin {
 	unsigned				nxt;
 };
 
-static unsigned __match_proto__(vdi_healthy)
+static unsigned v_matchproto_(vdi_healthy)
 vmod_rr_healthy(const struct director *dir, const struct busyobj *bo,
     double *changed)
 {
@@ -55,7 +55,7 @@ vmod_rr_healthy(const struct director *dir, const struct busyobj *bo,
 	return (vdir_any_healthy(rr->vd, bo, changed));
 }
 
-static const struct director * __match_proto__(vdi_resolve_f)
+static const struct director * v_matchproto_(vdi_resolve_f)
 vmod_rr_resolve(const struct director *dir, struct worker *wrk,
     struct busyobj *bo)
 {
@@ -83,7 +83,7 @@ vmod_rr_resolve(const struct director *dir, struct worker *wrk,
 	return (be);
 }
 
-VCL_VOID __match_proto__()
+VCL_VOID v_matchproto_()
 vmod_round_robin__init(VRT_CTX,
     struct vmod_directors_round_robin **rrp, const char *vcl_name)
 {
@@ -99,7 +99,7 @@ vmod_round_robin__init(VRT_CTX,
 	    vmod_rr_resolve, rr);
 }
 
-VCL_VOID __match_proto__()
+VCL_VOID v_matchproto_()
 vmod_round_robin__fini(struct vmod_directors_round_robin **rrp)
 {
 	struct vmod_directors_round_robin *rr;
@@ -111,7 +111,7 @@ vmod_round_robin__fini(struct vmod_directors_round_robin **rrp)
 	FREE_OBJ(rr);
 }
 
-VCL_VOID __match_proto__()
+VCL_VOID v_matchproto_()
 vmod_round_robin_add_backend(VRT_CTX,
     struct vmod_directors_round_robin *rr, VCL_BACKEND be)
 {
@@ -121,7 +121,7 @@ vmod_round_robin_add_backend(VRT_CTX,
 	vdir_add_backend(ctx, rr->vd, be, 0.0);
 }
 
-VCL_VOID __match_proto__()
+VCL_VOID v_matchproto_()
 vmod_round_robin_remove_backend(VRT_CTX,
     struct vmod_directors_round_robin *rr, VCL_BACKEND be)
 {
@@ -130,7 +130,7 @@ vmod_round_robin_remove_backend(VRT_CTX,
 	vdir_remove_backend(ctx, rr->vd, be, NULL);
 }
 
-VCL_BACKEND __match_proto__()
+VCL_BACKEND v_matchproto_()
 vmod_round_robin_backend(VRT_CTX,
     struct vmod_directors_round_robin *rr)
 {
diff --git a/lib/libvmod_directors/shard_hash.c b/lib/libvmod_directors/shard_hash.c
index 8ff0eec..9d0dc94 100644
--- a/lib/libvmod_directors/shard_hash.c
+++ b/lib/libvmod_directors/shard_hash.c
@@ -47,7 +47,7 @@
 
 unsigned long crc32(unsigned long, const unsigned char *buf, unsigned len);
 
-static uint32_t __match_proto__(hash_func)
+static uint32_t v_matchproto_(hash_func)
 shard_hash_crc32(VCL_STRING s)
 {
 	uint32_t crc;
@@ -56,7 +56,7 @@ shard_hash_crc32(VCL_STRING s)
 	return (crc);
 }
 
-static uint32_t __match_proto__(hash_func)
+static uint32_t v_matchproto_(hash_func)
 shard_hash_sha256(VCL_STRING s)
 {
 	struct VSHA256Context sha256;
@@ -78,7 +78,7 @@ shard_hash_sha256(VCL_STRING s)
 	return (r);
 }
 
-static uint32_t __match_proto__(hash_func)
+static uint32_t v_matchproto_(hash_func)
 shard_hash_rs(VCL_STRING s)
 {
 	uint32_t res = 0;
@@ -94,7 +94,7 @@ shard_hash_rs(VCL_STRING s)
 	return (res);
 }
 
-static uint32_t __match_proto__(hash_func)
+static uint32_t v_matchproto_(hash_func)
 _shard_hash_invalid(VCL_STRING s)
 {
 	(void)s;
diff --git a/lib/libvmod_directors/vmod_shard.c b/lib/libvmod_directors/vmod_shard.c
index 1893142..e5ddb58 100644
--- a/lib/libvmod_directors/vmod_shard.c
+++ b/lib/libvmod_directors/vmod_shard.c
@@ -48,7 +48,7 @@ struct vmod_directors_shard {
 	struct sharddir	*shardd;
 };
 
-VCL_VOID __match_proto__(td_directors_shard__init)
+VCL_VOID v_matchproto_(td_directors_shard__init)
 vmod_shard__init(VRT_CTX, struct vmod_directors_shard **vshardp,
     const char *vcl_name)
 {
@@ -73,7 +73,7 @@ vmod_shard__init(VRT_CTX, struct vmod_directors_shard **vshardp,
 	sharddir_new(&vshard->shardd, vcl_name);
 }
 
-VCL_VOID __match_proto__(td_directors_shard__fini)
+VCL_VOID v_matchproto_(td_directors_shard__fini)
 vmod_shard__fini(struct vmod_directors_shard **vshardp)
 {
 	struct vmod_directors_shard *vshard = *vshardp;
@@ -89,7 +89,7 @@ vmod_shard__fini(struct vmod_directors_shard **vshardp)
  * forth, asserting in vmod_shard__init() that VCL_INT is a large enough
  * container
  */
-VCL_INT __match_proto__(td_directors_shard_key)
+VCL_INT v_matchproto_(td_directors_shard_key)
     vmod_shard_key(VRT_CTX, struct vmod_directors_shard *vshard,
     VCL_STRING s, VCL_ENUM alg_s)
 {
@@ -102,7 +102,7 @@ VCL_INT __match_proto__(td_directors_shard_key)
 	return (VCL_INT)hash_fp(s ? s : "");
 }
 
-VCL_VOID __match_proto__(td_directors_set_warmup)
+VCL_VOID v_matchproto_(td_directors_set_warmup)
 vmod_shard_set_warmup(VRT_CTX, struct vmod_directors_shard *vshard,
     VCL_REAL probability)
 {
@@ -115,7 +115,7 @@ vmod_shard_set_warmup(VRT_CTX, struct vmod_directors_shard *vshard,
 	shardcfg_set_warmup(vshard->shardd, probability);
 }
 
-VCL_VOID __match_proto__(td_directors_set_rampup)
+VCL_VOID v_matchproto_(td_directors_set_rampup)
 vmod_shard_set_rampup(VRT_CTX, struct vmod_directors_shard *vshard,
     VCL_DURATION duration)
 {
@@ -124,7 +124,7 @@ vmod_shard_set_rampup(VRT_CTX, struct vmod_directors_shard *vshard,
 	shardcfg_set_rampup(vshard->shardd, duration);
 }
 
-VCL_BOOL __match_proto__(td_directors_shard_add_backend)
+VCL_BOOL v_matchproto_(td_directors_shard_add_backend)
 vmod_shard_add_backend(VRT_CTX, struct vmod_directors_shard *vshard,
     struct vmod_priv *priv,
     VCL_BACKEND be, VCL_STRING ident, VCL_DURATION rampup)
@@ -141,7 +141,7 @@ vmod_shard_add_backend(VRT_CTX, struct vmod_directors_shard *vshard,
 	    be, ident, rampup);
 }
 
-VCL_BOOL __match_proto__(td_directors_shard_remove_backend)
+VCL_BOOL v_matchproto_(td_directors_shard_remove_backend)
 vmod_shard_remove_backend(VRT_CTX, struct vmod_directors_shard *vshard,
     struct vmod_priv *priv,
     VCL_BACKEND be, VCL_STRING ident)
@@ -159,7 +159,7 @@ vmod_shard_remove_backend(VRT_CTX, struct vmod_directors_shard *vshard,
 	    be, ident);
 }
 
-VCL_BOOL __match_proto__(td_directors_shard_clear)
+VCL_BOOL v_matchproto_(td_directors_shard_clear)
 vmod_shard_clear(VRT_CTX, struct vmod_directors_shard *vshard,
     struct vmod_priv *priv)
 {
@@ -167,7 +167,7 @@ vmod_shard_clear(VRT_CTX, struct vmod_directors_shard *vshard,
 	return shardcfg_clear(ctx, priv, vshard->shardd);
 }
 
-VCL_BOOL __match_proto__(td_directors_shard_reconfigure)
+VCL_BOOL v_matchproto_(td_directors_shard_reconfigure)
 vmod_shard_reconfigure(VRT_CTX, struct vmod_directors_shard *vshard,
     struct vmod_priv *priv, VCL_INT replicas, VCL_ENUM alg_s)
 {
@@ -222,7 +222,7 @@ get_key(VRT_CTX, enum by_e by, VCL_INT key_int, VCL_BLOB key_blob)
 	}
 }
 
-VCL_BACKEND __match_proto__(td_directors_shard_backend)
+VCL_BACKEND v_matchproto_(td_directors_shard_backend)
 vmod_shard_backend(VRT_CTX, struct vmod_directors_shard *vshard,
     VCL_ENUM by_s, VCL_INT key_int, VCL_BLOB key_blob, VCL_INT alt,
     VCL_REAL warmup, VCL_BOOL rampup, VCL_ENUM healthy_s)
@@ -272,7 +272,7 @@ vmod_shard_backend(VRT_CTX, struct vmod_directors_shard *vshard,
 		key, alt, warmup, rampup, healthy));
 }
 
-VCL_VOID __match_proto__(td_directors_shard_backend)
+VCL_VOID v_matchproto_(td_directors_shard_backend)
 vmod_shard_debug(VRT_CTX, struct vmod_directors_shard *vshard,
     VCL_INT i)
 {
diff --git a/lib/libvmod_purge/vmod_purge.c b/lib/libvmod_purge/vmod_purge.c
index 0df0c45..1a01bae 100644
--- a/lib/libvmod_purge/vmod_purge.c
+++ b/lib/libvmod_purge/vmod_purge.c
@@ -38,7 +38,7 @@
 
 #include "vcc_if.h"
 
-VCL_INT __match_proto__(td_purge_hard)
+VCL_INT v_matchproto_(td_purge_hard)
 vmod_hard(VRT_CTX)
 {
 
@@ -46,7 +46,7 @@ vmod_hard(VRT_CTX)
 	return (VRT_purge(ctx, 0, 0, 0));
 }
 
-VCL_INT __match_proto__(td_purge_soft)
+VCL_INT v_matchproto_(td_purge_soft)
 vmod_soft(VRT_CTX, VCL_DURATION ttl, VCL_DURATION grace, VCL_DURATION keep)
 {
 
diff --git a/lib/libvmod_std/vmod_std.c b/lib/libvmod_std/vmod_std.c
index f4536ec..414a521 100644
--- a/lib/libvmod_std/vmod_std.c
+++ b/lib/libvmod_std/vmod_std.c
@@ -50,7 +50,7 @@
 
 #include "vcc_if.h"
 
-VCL_VOID __match_proto__(td_std_set_ip_tos)
+VCL_VOID v_matchproto_(td_std_set_ip_tos)
 vmod_set_ip_tos(VRT_CTX, VCL_INT tos)
 {
 	int itos = tos;
@@ -97,7 +97,7 @@ vmod_updown(VRT_CTX, int up, const char *s, va_list ap)
 	}
 }
 
-VCL_STRING __match_proto__(td_std_toupper)
+VCL_STRING v_matchproto_(td_std_toupper)
 vmod_toupper(VRT_CTX, const char *s, ...)
 {
 	const char *p;
@@ -110,7 +110,7 @@ vmod_toupper(VRT_CTX, const char *s, ...)
 	return (p);
 }
 
-VCL_STRING __match_proto__(td_std_tolower)
+VCL_STRING v_matchproto_(td_std_tolower)
 vmod_tolower(VRT_CTX, const char *s, ...)
 {
 	const char *p;
@@ -123,7 +123,7 @@ vmod_tolower(VRT_CTX, const char *s, ...)
 	return (p);
 }
 
-VCL_REAL __match_proto__(td_std_random)
+VCL_REAL v_matchproto_(td_std_random)
 vmod_random(VRT_CTX, VCL_REAL lo, VCL_REAL hi)
 {
 	double a;
@@ -135,7 +135,7 @@ vmod_random(VRT_CTX, VCL_REAL lo, VCL_REAL hi)
 	return (a);
 }
 
-VCL_VOID __match_proto__(td_std_log)
+VCL_VOID v_matchproto_(td_std_log)
 vmod_log(VRT_CTX, const char *fmt, ...)
 {
 	const char *p;
@@ -163,7 +163,7 @@ vmod_log(VRT_CTX, const char *fmt, ...)
 }
 
 /* XXX use vsyslog() ? */
-VCL_VOID __match_proto__(td_std_syslog)
+VCL_VOID v_matchproto_(td_std_syslog)
 vmod_syslog(VRT_CTX, VCL_INT fac, const char *fmt, ...)
 {
 	const char *p;
@@ -180,7 +180,7 @@ vmod_syslog(VRT_CTX, VCL_INT fac, const char *fmt, ...)
 	WS_Reset(ctx->ws, sn);
 }
 
-VCL_BOOL __match_proto__(td_std_file_exists)
+VCL_BOOL v_matchproto_(td_std_file_exists)
 vmod_file_exists(VRT_CTX, VCL_STRING file_name)
 {
 	struct stat st;
@@ -189,7 +189,7 @@ vmod_file_exists(VRT_CTX, VCL_STRING file_name)
 	return (stat(file_name, &st) == 0);
 }
 
-VCL_VOID __match_proto__(td_std_collect)
+VCL_VOID v_matchproto_(td_std_collect)
 vmod_collect(VRT_CTX, VCL_HEADER hdr, VCL_STRING sep)
 {
 	struct http *hp;
@@ -199,7 +199,7 @@ vmod_collect(VRT_CTX, VCL_HEADER hdr, VCL_STRING sep)
 	http_CollectHdrSep(hp, hdr->what, sep);
 }
 
-VCL_BOOL __match_proto__(td_std_healthy)
+VCL_BOOL v_matchproto_(td_std_healthy)
 vmod_healthy(VRT_CTX, VCL_BACKEND be)
 {
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
@@ -207,7 +207,7 @@ vmod_healthy(VRT_CTX, VCL_BACKEND be)
 	return (VRT_Healthy(ctx, be));
 }
 
-VCL_INT __match_proto__(td_std_port)
+VCL_INT v_matchproto_(td_std_port)
 vmod_port(VRT_CTX, VCL_IP ip)
 {
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
@@ -216,13 +216,13 @@ vmod_port(VRT_CTX, VCL_IP ip)
 	return (VSA_Port(ip));
 }
 
-VCL_VOID __match_proto__(td_std_rollback)
+VCL_VOID v_matchproto_(td_std_rollback)
 vmod_rollback(VRT_CTX, VCL_HTTP hp)
 {
 	VRT_Rollback(ctx, hp);
 }
 
-VCL_VOID __match_proto__(td_std_timestamp)
+VCL_VOID v_matchproto_(td_std_timestamp)
 vmod_timestamp(VRT_CTX, VCL_STRING label)
 {
 
@@ -242,7 +242,7 @@ vmod_timestamp(VRT_CTX, VCL_STRING label)
 	}
 }
 
-VCL_BOOL __match_proto__(td_std_cache_req_body)
+VCL_BOOL v_matchproto_(td_std_cache_req_body)
 vmod_cache_req_body(VRT_CTX, VCL_BYTES size)
 {
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
@@ -253,7 +253,7 @@ vmod_cache_req_body(VRT_CTX, VCL_BYTES size)
 	return (1);
 }
 
-VCL_STRING __match_proto__(td_std_strstr)
+VCL_STRING v_matchproto_(td_std_strstr)
 vmod_strstr(VRT_CTX, VCL_STRING s1, VCL_STRING s2)
 {
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
@@ -262,7 +262,7 @@ vmod_strstr(VRT_CTX, VCL_STRING s1, VCL_STRING s2)
 	return (strstr(s1, s2));
 }
 
-VCL_STRING __match_proto__(td_std_getenv)
+VCL_STRING v_matchproto_(td_std_getenv)
 vmod_getenv(VRT_CTX, VCL_STRING name)
 {
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
@@ -271,7 +271,7 @@ vmod_getenv(VRT_CTX, VCL_STRING name)
 	return (getenv(name));
 }
 
-VCL_VOID __match_proto__(td_std_late_100_continue)
+VCL_VOID v_matchproto_(td_std_late_100_continue)
 vmod_late_100_continue(VRT_CTX, VCL_BOOL late)
 {
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
diff --git a/lib/libvmod_std/vmod_std_conversions.c b/lib/libvmod_std/vmod_std_conversions.c
index c71b771..18b0b47 100644
--- a/lib/libvmod_std/vmod_std_conversions.c
+++ b/lib/libvmod_std/vmod_std_conversions.c
@@ -44,7 +44,7 @@
 #include "vtim.h"
 #include "vcc_if.h"
 
-VCL_DURATION __match_proto__(td_std_duration)
+VCL_DURATION v_matchproto_(td_std_duration)
 vmod_duration(VRT_CTX, VCL_STRING p, VCL_DURATION d)
 {
 	double r = VNUM_duration(p);
@@ -54,7 +54,7 @@ vmod_duration(VRT_CTX, VCL_STRING p, VCL_DURATION d)
 	return (isnan(r) ? d : r);
 }
 
-VCL_INT __match_proto__(td_std_integer)
+VCL_INT v_matchproto_(td_std_integer)
 vmod_integer(VRT_CTX, VCL_STRING p, VCL_INT i)
 {
 	const char *e;
@@ -119,7 +119,7 @@ vmod_ip(VRT_CTX, VCL_STRING s, VCL_IP d)
 	return (r);
 }
 
-VCL_REAL __match_proto__(td_std_real)
+VCL_REAL v_matchproto_(td_std_real)
 vmod_real(VRT_CTX, VCL_STRING p, VCL_REAL d)
 {
 	double r;
@@ -137,7 +137,7 @@ vmod_real(VRT_CTX, VCL_STRING p, VCL_REAL d)
 	return (r);
 }
 
-VCL_INT __match_proto__(td_std_real2integer)
+VCL_INT v_matchproto_(td_std_real2integer)
 vmod_real2integer(VRT_CTX, VCL_REAL r, VCL_INT i)
 {
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
@@ -150,7 +150,7 @@ vmod_real2integer(VRT_CTX, VCL_REAL r, VCL_INT i)
 	return ((long)r);
 }
 
-VCL_TIME __match_proto__(td_std_real2time)
+VCL_TIME v_matchproto_(td_std_real2time)
 vmod_real2time(VRT_CTX, VCL_REAL r, VCL_TIME t)
 {
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
@@ -161,7 +161,7 @@ vmod_real2time(VRT_CTX, VCL_REAL r, VCL_TIME t)
 	return (r);
 }
 
-VCL_INT __match_proto__(td_std_time2integer)
+VCL_INT v_matchproto_(td_std_time2integer)
 vmod_time2integer(VRT_CTX, VCL_TIME t, VCL_INT i)
 {
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
@@ -174,7 +174,7 @@ vmod_time2integer(VRT_CTX, VCL_TIME t, VCL_INT i)
 	return ((long)t);
 }
 
-VCL_REAL __match_proto__(td_std_time2real)
+VCL_REAL v_matchproto_(td_std_time2real)
 vmod_time2real(VRT_CTX, VCL_TIME t, VCL_REAL r)
 {
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
@@ -185,7 +185,7 @@ vmod_time2real(VRT_CTX, VCL_TIME t, VCL_REAL r)
 	return (t);
 }
 
-VCL_TIME __match_proto__(td_std_time)
+VCL_TIME v_matchproto_(td_std_time)
 vmod_time(VRT_CTX, VCL_STRING p, VCL_TIME d)
 {
 	double r;
diff --git a/lib/libvmod_std/vmod_std_fileread.c b/lib/libvmod_std/vmod_std_fileread.c
index 2be46ff..201d743 100644
--- a/lib/libvmod_std/vmod_std_fileread.c
+++ b/lib/libvmod_std/vmod_std_fileread.c
@@ -80,7 +80,7 @@ free_frfile(void *ptr)
 	}
 }
 
-VCL_STRING __match_proto__(td_std_fileread)
+VCL_STRING v_matchproto_(td_std_fileread)
 vmod_fileread(VRT_CTX, struct vmod_priv *priv,
     VCL_STRING file_name)
 {
diff --git a/lib/libvmod_std/vmod_std_querysort.c b/lib/libvmod_std/vmod_std_querysort.c
index 52a95f9..4b99092 100644
--- a/lib/libvmod_std/vmod_std_querysort.c
+++ b/lib/libvmod_std/vmod_std_querysort.c
@@ -48,7 +48,7 @@ compa(const void *a, const void *b)
 	return (0);
 }
 
-VCL_STRING __match_proto__(td_std_querysort)
+VCL_STRING v_matchproto_(td_std_querysort)
 vmod_querysort(VRT_CTX, VCL_STRING url)
 {
 	const char *cq, *cu;
diff --git a/lib/libvmod_vtc/vmod_vtc.c b/lib/libvmod_vtc/vmod_vtc.c
index c91eb2e..6b6501a 100644
--- a/lib/libvmod_vtc/vmod_vtc.c
+++ b/lib/libvmod_vtc/vmod_vtc.c
@@ -41,7 +41,7 @@
 
 #include "vcc_if.h"
 
-VCL_VOID __match_proto__(td_vtc_barrier_sync)
+VCL_VOID v_matchproto_(td_vtc_barrier_sync)
 vmod_barrier_sync(VRT_CTX, VCL_STRING addr, VCL_DURATION tmo)
 {
 	const char *err;
@@ -73,7 +73,7 @@ vmod_barrier_sync(VRT_CTX, VCL_STRING addr, VCL_DURATION tmo)
 
 /*--------------------------------------------------------------------*/
 
-VCL_BACKEND __match_proto__(td_vtc_no_backend)
+VCL_BACKEND v_matchproto_(td_vtc_no_backend)
 vmod_no_backend(VRT_CTX)
 {
 
@@ -81,7 +81,7 @@ vmod_no_backend(VRT_CTX)
 	return (NULL);
 }
 
-VCL_STEVEDORE __match_proto__(td_vtc_no_stevedore)
+VCL_STEVEDORE v_matchproto_(td_vtc_no_stevedore)
 vmod_no_stevedore(VRT_CTX)
 {
 
@@ -91,7 +91,7 @@ vmod_no_stevedore(VRT_CTX)
 
 /*--------------------------------------------------------------------*/
 
-VCL_VOID __match_proto__(td_vtc_panic)
+VCL_VOID v_matchproto_(td_vtc_panic)
 vmod_panic(VRT_CTX, const char *str, ...)
 {
 	va_list ap;
@@ -107,7 +107,7 @@ vmod_panic(VRT_CTX, const char *str, ...)
 
 /*--------------------------------------------------------------------*/
 
-VCL_VOID __match_proto__(td_vtc_sleep)
+VCL_VOID v_matchproto_(td_vtc_sleep)
 vmod_sleep(VRT_CTX, VCL_DURATION t)
 {
 
@@ -134,7 +134,7 @@ vtc_ws_find(VRT_CTX, VCL_ENUM which)
 	WRONG("vtc_ws_find Illegal enum");
 }
 
-VCL_VOID __match_proto__(td_vtc_workspace_alloc)
+VCL_VOID v_matchproto_(td_vtc_workspace_alloc)
 vmod_workspace_alloc(VRT_CTX, VCL_ENUM which, VCL_INT size)
 {
 	struct ws *ws;
@@ -162,7 +162,7 @@ vmod_workspace_alloc(VRT_CTX, VCL_ENUM which, VCL_INT size)
 		memset(p, '\0', size);
 }
 
-VCL_INT __match_proto__(td_vtc_workspace_free)
+VCL_INT v_matchproto_(td_vtc_workspace_free)
 vmod_workspace_free(VRT_CTX, VCL_ENUM which)
 {
 	struct ws *ws;
@@ -181,7 +181,7 @@ vmod_workspace_free(VRT_CTX, VCL_ENUM which)
 }
 
 #define VTC_WS_OP(type, def, name, op)			\
-VCL_##type __match_proto__(td_vtc_workspace_##name)	\
+VCL_##type v_matchproto_(td_vtc_workspace_##name)	\
 vmod_workspace_##name(VRT_CTX, VCL_ENUM which)		\
 {							\
 	struct ws *ws;					\
@@ -203,7 +203,7 @@ VTC_WS_OP(BOOL, (0), overflowed, return (WS_Overflowed(ws)))
 
 /*--------------------------------------------------------------------*/
 
-VCL_INT __match_proto__(td_vtc_typesize)
+VCL_INT v_matchproto_(td_vtc_typesize)
 vmod_typesize(VRT_CTX, VCL_STRING s)
 {
 	size_t i = 0;

From phk at FreeBSD.org  Thu Nov 30 10:28:05 2017
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Thu, 30 Nov 2017 10:28:05 +0000 (UTC)
Subject: [master] 74b614c Include vdef.h properly
Message-ID: <20171130102805.8026B94CB8@lists.varnish-cache.org>


commit 74b614cfc7a6f6e017a36020a91107a4c27ecfbe
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Nov 30 10:27:06 2017 +0000

    Include vdef.h properly

diff --git a/lib/libvarnish/vmb.c b/lib/libvarnish/vmb.c
index f98e31e..af86024 100644
--- a/lib/libvarnish/vmb.c
+++ b/lib/libvarnish/vmb.c
@@ -35,6 +35,8 @@
 #include <pthread.h>
 #include <unistd.h>
 
+#include "vdef.h"
+
 #include "vas.h"
 
 static pthread_mutex_t	mb_mtx;

From nils.goroll at uplex.de  Thu Nov 30 12:22:09 2017
From: nils.goroll at uplex.de (Nils Goroll)
Date: Thu, 30 Nov 2017 12:22:09 +0000 (UTC)
Subject: [master] 930f73d Reduce VSL noise from Debug PROXY_HDR
Message-ID: <20171130122209.ADFC99414A@lists.varnish-cache.org>


commit 930f73d6b06e773f90bc4d859771ba974311533a
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Thu Nov 30 13:20:37 2017 +0100

    Reduce VSL noise from Debug PROXY_HDR

diff --git a/bin/varnishd/proxy/cache_proxy_proto.c b/bin/varnishd/proxy/cache_proxy_proto.c
index 1ec3a6b..629a013 100644
--- a/bin/varnishd/proxy/cache_proxy_proto.c
+++ b/bin/varnishd/proxy/cache_proxy_proto.c
@@ -467,6 +467,11 @@ VPX_Send_Proxy(int fd, int version, const struct sess *sp)
 
 	AZ(VSB_finish(vsb));
 	(void)write(fd, VSB_data(vsb), VSB_len(vsb));
+	if (! DO_DEBUG(DBG_PROTOCOL)) {
+		VSB_delete(vsb);
+		return;
+	}
+
 	vsb2 = VSB_new_auto();
 	AN(vsb2);
 	VSB_quote(vsb2, VSB_data(vsb), VSB_len(vsb),
diff --git a/include/tbl/debug_bits.h b/include/tbl/debug_bits.h
index 3579a5d..4ac3ef6 100644
--- a/include/tbl/debug_bits.h
+++ b/include/tbl/debug_bits.h
@@ -49,6 +49,7 @@ DEBUG_BIT(SLOW_ACCEPTOR,	slow_acceptor,	"Slow down Acceptor")
 DEBUG_BIT(H2_NOCHECK,		h2_nocheck,	"Disable various H2 checks")
 DEBUG_BIT(VMOD_SO_KEEP,		vmod_so_keep,	"Keep copied VMOD libraries")
 DEBUG_BIT(PROCESSORS,		processors,	"Fetch/Deliver processors")
+DEBUG_BIT(PROTOCOL,		protocol,	"Protocol debugging")
 #undef DEBUG_BIT
 
 /*lint -restore */

From fgsch at lodoss.net  Thu Nov 30 23:17:08 2017
From: fgsch at lodoss.net (Federico G. Schwindt)
Date: Thu, 30 Nov 2017 23:17:08 +0000 (UTC)
Subject: [master] 752489b Respect TMPDIR if present
Message-ID: <20171130231708.6AEEF945DF@lists.varnish-cache.org>


commit 752489b5c296f61c56010b748e6594da57708d0f
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Thu Nov 30 14:37:41 2017 +0000

    Respect TMPDIR if present

diff --git a/bin/varnishd/mgt/mgt_main.c b/bin/varnishd/mgt/mgt_main.c
index 9aee532..f460f5e 100644
--- a/bin/varnishd/mgt/mgt_main.c
+++ b/bin/varnishd/mgt/mgt_main.c
@@ -66,7 +66,7 @@ int			exit_status = 0;
 struct vsb		*vident;
 struct VSC_mgt		*VSC_C_mgt;
 static int		I_fd = -1;
-static char		Cn_arg[] = "/tmp/varnishd_C_XXXXXXX";
+static char 		*Cn_arg;
 
 static struct vpf_fh *pfh1 = NULL;
 static struct vpf_fh *pfh2 = NULL;
@@ -687,6 +687,17 @@ main(int argc, char * const *argv)
 
 	if (C_flag) {
 		if (n_arg == NULL) {
+			vsb = VSB_new_auto();
+			AN(vsb);
+			if (getenv("TMPDIR") != NULL)
+				VSB_printf(vsb, "%s", getenv("TMPDIR"));
+			else
+				VSB_printf(vsb, "/tmp");
+			VSB_printf(vsb, "/varnishd_C_XXXXXXX");
+			AZ(VSB_finish(vsb));
+			Cn_arg = strdup(VSB_data(vsb));
+			AN(Cn_arg);
+			VSB_destroy(&vsb);
 			AN(mkdtemp(Cn_arg));
 			AZ(chmod(Cn_arg, 0755));
 			AZ(atexit(mgt_Cflag_atexit));

From fgsch at lodoss.net  Thu Nov 30 23:17:08 2017
From: fgsch at lodoss.net (Federico G. Schwindt)
Date: Thu, 30 Nov 2017 23:17:08 +0000 (UTC)
Subject: [master] 208fb45 Whitespace OCD
Message-ID: <20171130231708.8AE60945E1@lists.varnish-cache.org>


commit 208fb45005f5e7665d92516f1cdae20998c8d9d3
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Thu Nov 30 16:42:39 2017 +0000

    Whitespace OCD

diff --git a/bin/varnishd/http1/cache_http1_deliver.c b/bin/varnishd/http1/cache_http1_deliver.c
index f4bfb03..b1b8627 100644
--- a/bin/varnishd/http1/cache_http1_deliver.c
+++ b/bin/varnishd/http1/cache_http1_deliver.c
@@ -145,13 +145,13 @@ V1D_Deliver(struct req *req, struct boc *boc, int sendbody)
 	if (DO_DEBUG(DBG_FLUSH_HEAD))
 		(void)V1L_Flush(req->wrk);
 
-	if (! sendbody || req->res_mode & RES_ESI)
+	if (!sendbody || req->res_mode & RES_ESI)
 		if (V1L_Close(req->wrk) && req->sp->fd >= 0) {
 			Req_Fail(req, SC_REM_CLOSE);
 			sendbody = 0;
 		}
 
-	if (! sendbody) {
+	if (!sendbody) {
 		AZ(req->wrk->v1l);
 		VDP_close(req);
 		return;
diff --git a/bin/varnishd/proxy/cache_proxy_proto.c b/bin/varnishd/proxy/cache_proxy_proto.c
index 629a013..fbef883 100644
--- a/bin/varnishd/proxy/cache_proxy_proto.c
+++ b/bin/varnishd/proxy/cache_proxy_proto.c
@@ -467,7 +467,7 @@ VPX_Send_Proxy(int fd, int version, const struct sess *sp)
 
 	AZ(VSB_finish(vsb));
 	(void)write(fd, VSB_data(vsb), VSB_len(vsb));
-	if (! DO_DEBUG(DBG_PROTOCOL)) {
+	if (!DO_DEBUG(DBG_PROTOCOL)) {
 		VSB_delete(vsb);
 		return;
 	}
diff --git a/doc/sphinx/phk/apispaces.rst b/doc/sphinx/phk/apispaces.rst
index d561a14..5da87e6 100644
--- a/doc/sphinx/phk/apispaces.rst
+++ b/doc/sphinx/phk/apispaces.rst
@@ -98,7 +98,7 @@ This API space could also have been called 'inline', because it
 is basically what you see in the C-source generated by VCC:
 
 | Include files allowed:
-| 
+|
 | 	``#include "vdef.h"``
 | 	``#include "vrt.h"``
 | 	``#include "vrt_obj.h"``
@@ -125,7 +125,7 @@ This API space provides access to everything in the ``VRT`` API
 space plus the other exposed and supported APIs in varnishd.
 
 | Include files allowed:
-| 
+|
 |	``#include "cache.h"		// NB: includes vdef.h and vrt.h``
 |	``#include "cache_backend.h"``
 |	``#include "cache_director.h"``
diff --git a/doc/sphinx/whats-new/changes-5.2.rst b/doc/sphinx/whats-new/changes-5.2.rst
index 43764b3..6834325 100644
--- a/doc/sphinx/whats-new/changes-5.2.rst
+++ b/doc/sphinx/whats-new/changes-5.2.rst
@@ -46,7 +46,7 @@ See :ref:`vmod_purge(3)`.
 VMOD vtc
 --------
 
-As long as we have had VMODs, we had an internal vmod called ``vmod_debug`` 
+As long as we have had VMODs, we had an internal vmod called ``vmod_debug``
 which was used with ``varnishtest`` to exercise the VMOD related parts of
 ``varnishd``.  Over time this vmod grew other useful functions for writing
 test-cases.
diff --git a/lib/libvarnish/binary_heap.c b/lib/libvarnish/binary_heap.c
index d537c94..88c85d4 100644
--- a/lib/libvarnish/binary_heap.c
+++ b/lib/libvarnish/binary_heap.c
@@ -537,7 +537,7 @@ main(int argc, char **argv)
 		child(bh, n + 1, &u, &v);
 	}
 
-	for(j = 0; j < 2; j++) {
+	for (j = 0; j < 2; j++) {
 		/* First insert our N elements */
 		for (u = 0; u < N; u++) {
 			lr = VRND_RandomTestable() % R;
diff --git a/lib/libvarnish/vcli_serve.c b/lib/libvarnish/vcli_serve.c
index 689553d..a5e6714 100644
--- a/lib/libvarnish/vcli_serve.c
+++ b/lib/libvarnish/vcli_serve.c
@@ -339,7 +339,7 @@ cls_feed(struct VCLS_fd *cfd, const char *p, const char *e)
 	cli = cfd->cli;
 	CHECK_OBJ_NOTNULL(cli, CLI_MAGIC);
 
-	for(;p < e; p++) {
+	for (;p < e; p++) {
 		if (cli->cmd == NULL && isspace(*p)) {
 			/* Ignore all leading space before cmd */
 			continue;
diff --git a/lib/libvarnishapi/vsc.c b/lib/libvarnishapi/vsc.c
index 155c675..45a159a 100644
--- a/lib/libvarnishapi/vsc.c
+++ b/lib/libvarnishapi/vsc.c
@@ -301,7 +301,7 @@ vsc_del_seg(const struct vsc *vsc, struct vsm *vsm, struct vsc_seg *sp)
 	AZ(VSM_Unmap(vsm, sp->fantom));
 	vjsn_delete(&sp->vj);
 	pp = sp->points;
-	for(u = 0; u < sp->npoints; u++, pp++) {
+	for (u = 0; u < sp->npoints; u++, pp++) {
 		if (vsc->fdestroy != NULL)
 			vsc->fdestroy(vsc->priv, &pp->point);
 		vsc_clean_point(pp);
@@ -381,7 +381,7 @@ vsc_iter_seg(const struct vsc *vsc, const struct vsc_seg *sp,
 	CHECK_OBJ_NOTNULL(sp, VSC_SEG_MAGIC);
 	AN(fiter);
 	pp = sp->points;
-	for(u = 0; u < sp->npoints && i == 0; u++, pp++) {
+	for (u = 0; u < sp->npoints && i == 0; u++, pp++) {
 		if (pp->name != NULL)
 			i = fiter(priv, &pp->point);
 	}
diff --git a/lib/libvarnishapi/vsl_arg.c b/lib/libvarnishapi/vsl_arg.c
index 5d69798..b4bef5a 100644
--- a/lib/libvarnishapi/vsl_arg.c
+++ b/lib/libvarnishapi/vsl_arg.c
@@ -96,7 +96,7 @@ VSL_Glob2Tags(const char *glob, int l, VSL_tagfind_f *func, void *priv)
 	if (glob == e)
 		return (-1);		// Empty pattern cannot match
 
-	for(p = glob; p < e; p++)
+	for (p = glob; p < e; p++)
 		if (*p == '*')
 			break;
 
@@ -119,7 +119,7 @@ VSL_Glob2Tags(const char *glob, int l, VSL_tagfind_f *func, void *priv)
 		l2 = e - p2;
 	}
 
-	for(p++; p < e; p++)
+	for (p++; p < e; p++)
 		if (*p == '*')
 			return (-3);	// More than one wildcard
 
diff --git a/lib/libvmod_blob/url.c b/lib/libvmod_blob/url.c
index 7babb18..8ba47fc 100644
--- a/lib/libvmod_blob/url.c
+++ b/lib/libvmod_blob/url.c
@@ -137,7 +137,7 @@ url_decode(const enum encoding dec, char *restrict const buf,
 		while (*s && len) {
 			uint8_t nib2;
 
-			switch(state) {
+			switch (state) {
 			case NORMAL:
 				if (*s == '%')
 					state = PERCENT;
diff --git a/lib/libvmod_blob/vmod_blob.c b/lib/libvmod_blob/vmod_blob.c
index a509b34..927af20 100644
--- a/lib/libvmod_blob/vmod_blob.c
+++ b/lib/libvmod_blob/vmod_blob.c
@@ -141,7 +141,7 @@ decode_l_va(enum encoding dec, const char * const p, va_list ap)
 static void
 err_decode(VRT_CTX, const char *enc)
 {
-	switch(errno) {
+	switch (errno) {
 	case EINVAL:
 		ERRINVAL(ctx, enc);
 		break;
@@ -156,7 +156,7 @@ err_decode(VRT_CTX, const char *enc)
 static inline enum case_e
 parse_case(VCL_ENUM case_s)
 {
-	switch(*case_s) {
+	switch (*case_s) {
 	case 'D':
 		AZ(strcmp(case_s + 1, "EFAULT"));
 		return DEFAULT;

From gquintard at users.noreply.github.com  Mon Nov  6 14:36:07 2017
From: gquintard at users.noreply.github.com (guillaume quintard)
Date: Mon, 06 Nov 2017 14:36:07 -0000
Subject: [master] 458d50d Use pkg-config for curses, if possible
Message-ID: <20171106143607.62B2A61401@lists.varnish-cache.org>


commit 458d50d5c92f576d8701db0861cb261a4b5984b0
Author: Guillaume Quintard <guillaume at varnish-software.com>
Date:   Mon Oct 30 15:58:22 2017 +0100

    Use pkg-config for curses, if possible

diff --git a/bin/varnishhist/Makefile.am b/bin/varnishhist/Makefile.am
index 9c58a86..9fa07e5 100644
--- a/bin/varnishhist/Makefile.am
+++ b/bin/varnishhist/Makefile.am
@@ -18,4 +18,4 @@ varnishhist_LDADD = \
 	$(top_builddir)/lib/libvarnishapi/libvarnishapi.la \
 	-lm \
 	@SAN_LDFLAGS@ \
-	@CURSES_LIB@ ${RT_LIBS} ${PTHREAD_LIBS}
+	@CURSES_LIBS@ ${RT_LIBS} ${PTHREAD_LIBS}
diff --git a/bin/varnishstat/Makefile.am b/bin/varnishstat/Makefile.am
index c13bcd3..129e75f 100644
--- a/bin/varnishstat/Makefile.am
+++ b/bin/varnishstat/Makefile.am
@@ -18,4 +18,4 @@ varnishstat_CFLAGS = \
 varnishstat_LDADD = \
 	$(top_builddir)/lib/libvarnishapi/libvarnishapi.la \
 	@SAN_LDFLAGS@ \
-	@CURSES_LIB@ ${RT_LIBS} ${LIBM} ${PTHREAD_LIBS}
+	@CURSES_LIBS@ ${RT_LIBS} ${LIBM} ${PTHREAD_LIBS}
diff --git a/bin/varnishtop/Makefile.am b/bin/varnishtop/Makefile.am
index d6923c1..d26fd03 100644
--- a/bin/varnishtop/Makefile.am
+++ b/bin/varnishtop/Makefile.am
@@ -17,4 +17,4 @@ varnishtop_CFLAGS = \
 varnishtop_LDADD = \
 	$(top_builddir)/lib/libvarnishapi/libvarnishapi.la \
 	@SAN_LDFLAGS@ \
-	@CURSES_LIB@ ${RT_LIBS} ${LIBM} ${PTHREAD_LIBS}
+	@CURSES_LIBS@ ${RT_LIBS} ${LIBM} ${PTHREAD_LIBS}
diff --git a/configure.ac b/configure.ac
index 9d72283..42ed74a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -82,11 +82,6 @@ _VARNISH_CHECK_LIB(nsl, getaddrinfo)
 
 AC_SUBST(NET_LIBS, "${SOCKET_LIBS} ${NSL_LIBS}")
 
-AX_WITH_CURSES
-if test "x$ax_cv_curses" != xyes; then
-   AC_MSG_ERROR([requires an X/Open-compatible Curses library])
-fi
-
 # Userland slab allocator from Solaris, ported to other systems
 AC_CHECK_HEADERS([umem.h], [_VARNISH_CHECK_LIB(umem, umem_alloc)])
 
@@ -187,6 +182,21 @@ AC_CHECK_HEADERS([edit/readline/readline.h],
 		])
 	])
 
+PKG_CHECK_MODULES([CURSES], [ncursesw], [], [
+	PKG_CHECK_MODULES([CURSES], [ncurses], [], [
+		PKG_CHECK_MODULES([CURSES], [curses], [], [
+AX_WITH_CURSES
+if test "x$ax_cv_curses" != xyes; then
+	AC_MSG_ERROR([requires an X/Open-compatible Curses library])
+fi
+CURSES_LIBS="$CURSES_LIB"
+		])
+	])
+])
+AC_SUBST([CURSES_LIBS])
+
+AC_CHECK_HEADERS([ncursesw/curses.h ncursesw.h ncurses/curses.h ncurses.h curses.h])
+
 # Checks for header files.
 AC_HEADER_STDC
 AC_CHECK_HEADERS([sys/endian.h])