From phk at FreeBSD.org  Thu Aug  1 07:40:10 2019
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Thu,  1 Aug 2019 07:40:10 +0000 (UTC)
Subject: [master] 3c22a6162 Prefix VSM lines which add segments with a '+'
Message-ID: <20190801074010.6D9C7A7A82@lists.varnish-cache.org>


commit 3c22a61625b5eda186aa8c90178c086e8b003f55
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Jul 31 19:55:42 2019 +0000

    Prefix VSM lines which add segments with a '+'

diff --git a/bin/varnishd/common/common_vsmw.c b/bin/varnishd/common/common_vsmw.c
index 498045d4e..8e22756f0 100644
--- a/bin/varnishd/common/common_vsmw.c
+++ b/bin/varnishd/common/common_vsmw.c
@@ -132,7 +132,7 @@ vsmw_fmt_index(const struct vsmw *vsmw, const struct vsmwseg *seg)
 
 	CHECK_OBJ_NOTNULL(vsmw, VSMW_MAGIC);
 	CHECK_OBJ_NOTNULL(seg, VSMWSEG_MAGIC);
-	VSB_printf(vsmw->vsb, "%s %zu %zu %s %s\n",
+	VSB_printf(vsmw->vsb, "+ %s %zu %zu %s %s\n",
 	    seg->cluster->fn,
 	    seg->off,
 	    seg->len,
diff --git a/lib/libvarnishapi/vsm.c b/lib/libvarnishapi/vsm.c
index 364ad3aee..51f9ccdf1 100644
--- a/lib/libvarnishapi/vsm.c
+++ b/lib/libvarnishapi/vsm.c
@@ -459,7 +459,7 @@ vsm_vlu_plus(struct vsm *vd, struct vsm_set *vs, const char *line)
 	int ac;
 	struct vsm_seg *vg2;
 
-	av = VAV_Parse(line, &ac, 0);
+	av = VAV_Parse(line + 1, &ac, 0);
 
 	if (av[0] != NULL || ac < 4 || ac > 6) {
 		(void)(vsm_diag(vd,
@@ -508,14 +508,19 @@ vsm_vlu_func(void *priv, const char *line)
 	CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);
 	AN(line);
 
-	if (line[0] == '#') {
+	switch (line[0]) {
+	case '#':
 		i = vsm_vlu_hash(vd, vs, line);
 		VTAILQ_FOREACH(vs->vg, &vs->segs, list)
 			vs->vg->flags &= ~VSM_FLAG_MARKSCAN;
 		if (!(vs->retval & VSM_MGT_RESTARTED))
 			vs->vg = VTAILQ_FIRST(&vs->segs);
-	} else {
+		break;
+	case '+':
 		i = vsm_vlu_plus(vd, vs, line);
+		break;
+	default:
+		break;
 	}
 	return (i);
 }

From phk at FreeBSD.org  Thu Aug  1 07:40:10 2019
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Thu,  1 Aug 2019 07:40:10 +0000 (UTC)
Subject: [master] 5f97b89a1 Avoid lock/unlock/lock/unlock for cluster delete
Message-ID: <20190801074010.835DFA7A85@lists.varnish-cache.org>


commit 5f97b89a136a76932c41bf42d91a823a4a4e2e02
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Aug 1 07:33:40 2019 +0000

    Avoid lock/unlock/lock/unlock for cluster delete

diff --git a/bin/varnishd/common/common_vsmw.c b/bin/varnishd/common/common_vsmw.c
index 8e22756f0..6d8a17e4a 100644
--- a/bin/varnishd/common/common_vsmw.c
+++ b/bin/varnishd/common/common_vsmw.c
@@ -281,7 +281,6 @@ VSMW_DestroyCluster(struct vsmw *vsmw, struct vsmw_cluster **vsmcp)
 {
 	struct vsmw_cluster *vc;
 
-	vsmw_lock();
 	CHECK_OBJ_NOTNULL(vsmw, VSMW_MAGIC);
 	TAKE_OBJ_NOTNULL(vc, vsmcp, VSMW_CLUSTER_MAGIC);
 
@@ -294,10 +293,8 @@ VSMW_DestroyCluster(struct vsmw *vsmw, struct vsmw_cluster **vsmcp)
 		 */
 		vsmw_delseg(vsmw, vc->cseg, 1);
 		vc->cseg = NULL;
-		if (vc->refs > 0) {
-			vsmw_unlock();
+		if (vc->refs > 0)
 			return;
-		}
 	}
 	AZ(munmap(vc->ptr, vc->len));
 
@@ -307,7 +304,6 @@ VSMW_DestroyCluster(struct vsmw *vsmw, struct vsmw_cluster **vsmcp)
 		assert (errno == ENOENT);
 	REPLACE(vc->fn, NULL);
 	FREE_OBJ(vc);
-	vsmw_unlock();
 }
 
 /*--------------------------------------------------------------------*/
@@ -369,26 +365,24 @@ void
 VSMW_Free(struct vsmw *vsmw, void **pp)
 {
 	struct vsmwseg *seg;
-	void *p;
+	struct vsmw_cluster *cp;
 
 	vsmw_lock();
 	CHECK_OBJ_NOTNULL(vsmw, VSMW_MAGIC);
 	AN(pp);
-	p = *pp;
-	AN(p);
-	*pp = NULL;
 	VTAILQ_FOREACH(seg, &vsmw->segs, list)
-		if (seg->ptr == p)
+		if (seg->ptr == *pp)
 			break;
 	AN(seg);
+	*pp = NULL;
 
-	if (!--seg->cluster->refs && seg->cluster->cseg == NULL) {
-		vsmw_unlock();
-		VSMW_DestroyCluster(vsmw, &seg->cluster);
-		vsmw_lock();
-	}
+	cp = seg->cluster;
 
 	vsmw_delseg(vsmw, seg, 1);
+
+	if (!--cp->refs && cp->cseg == NULL)
+		VSMW_DestroyCluster(vsmw, &cp);
+
 	vsmw_unlock();
 }
 

From phk at FreeBSD.org  Thu Aug  1 08:02:09 2019
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Thu,  1 Aug 2019 08:02:09 +0000 (UTC)
Subject: [master] a0e4bab90 Introduce '-' records in VSM _.index files,
 to reduce VFS workload.
Message-ID: <20190801080209.C6840A83B6@lists.varnish-cache.org>


commit a0e4bab90da04b2ffcf8a5416d5bf8886daab0a9
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Aug 1 08:00:56 2019 +0000

    Introduce '-' records in VSM _.index files, to reduce VFS workload.

diff --git a/bin/varnishd/common/common_vsmw.c b/bin/varnishd/common/common_vsmw.c
index 6d8a17e4a..4a01064e9 100644
--- a/bin/varnishd/common/common_vsmw.c
+++ b/bin/varnishd/common/common_vsmw.c
@@ -112,6 +112,8 @@ struct vsmw {
 	struct vsb			*vsb;
 	pid_t				pid;
 	time_t				birth;
+	uint64_t			nsegs;
+	uint64_t			nsubs;
 };
 
 /*--------------------------------------------------------------------*/
@@ -127,12 +129,14 @@ vsmw_idx_head(const struct vsmw *vsmw, int fd)
 }
 
 static void
-vsmw_fmt_index(const struct vsmw *vsmw, const struct vsmwseg *seg)
+vsmw_fmt_index(const struct vsmw *vsmw, const struct vsmwseg *seg, char act)
 {
 
 	CHECK_OBJ_NOTNULL(vsmw, VSMW_MAGIC);
 	CHECK_OBJ_NOTNULL(seg, VSMWSEG_MAGIC);
-	VSB_printf(vsmw->vsb, "+ %s %zu %zu %s %s\n",
+	AN(seg->cluster);
+	VSB_printf(vsmw->vsb, "%c %s %zu %zu %s %s\n",
+	    act,
 	    seg->cluster->fn,
 	    seg->off,
 	    seg->len,
@@ -166,18 +170,31 @@ vsmw_mkent(const struct vsmw *vsmw, const char *pfx)
 /*--------------------------------------------------------------------*/
 
 static void
-vsmw_addseg(struct vsmw *vsmw, struct vsmwseg *seg)
+vsmw_append_record(struct vsmw *vsmw, struct vsmwseg *seg, char act)
 {
 	int fd;
 
-	VTAILQ_INSERT_TAIL(&vsmw->segs, seg, list);
+	CHECK_OBJ_NOTNULL(vsmw, VSMW_MAGIC);
+	CHECK_OBJ_NOTNULL(seg, VSMWSEG_MAGIC);
 	fd = openat(vsmw->vdirfd, vsmw->idx, O_APPEND | O_WRONLY);
 	assert(fd >= 0);
 	VSB_clear(vsmw->vsb);
-	vsmw_fmt_index(vsmw, seg);
+	vsmw_fmt_index(vsmw, seg, act);
 	AZ(VSB_finish(vsmw->vsb));
 	XXXAZ(VSB_tofile(fd, vsmw->vsb)); // XXX handle ENOSPC? #2764
 	closefd(&fd);
+	vsmw->nsegs++;
+}
+
+/*--------------------------------------------------------------------*/
+
+static void
+vsmw_addseg(struct vsmw *vsmw, struct vsmwseg *seg)
+{
+
+	VTAILQ_INSERT_TAIL(&vsmw->segs, seg, list);
+	vsmw_append_record(vsmw, seg, '+');
+	vsmw->nsegs++;
 }
 
 /*--------------------------------------------------------------------*/
@@ -187,16 +204,19 @@ vsmw_delseg(struct vsmw *vsmw, struct vsmwseg *seg, int fixidx)
 {
 	char *t = NULL;
 	int fd;
+	struct vsmwseg *s2;
 
 	CHECK_OBJ_NOTNULL(vsmw, VSMW_MAGIC);
 	CHECK_OBJ_NOTNULL(seg, VSMWSEG_MAGIC);
 
 	VTAILQ_REMOVE(&vsmw->segs, seg, list);
-	REPLACE(seg->class, NULL);
-	REPLACE(seg->id, NULL);
-	FREE_OBJ(seg);
 
-	if (fixidx) {
+	vsmw->nsegs--;
+	if (vsmw->nsubs < vsmw->nsegs || !fixidx) {
+		vsmw_append_record(vsmw, seg, '-');
+		vsmw->nsubs++;
+	} else {
+		vsmw->nsubs = 0;
 		vsmw_mkent(vsmw, vsmw->idx);
 		REPLACE(t, VSB_data(vsmw->vsb));
 		AN(t);
@@ -205,14 +225,17 @@ vsmw_delseg(struct vsmw *vsmw, struct vsmwseg *seg, int fixidx)
 		assert(fd >= 0);
 		vsmw_idx_head(vsmw, fd);
 		VSB_clear(vsmw->vsb);
-		VTAILQ_FOREACH(seg, &vsmw->segs, list)
-			vsmw_fmt_index(vsmw, seg);
+		VTAILQ_FOREACH(s2, &vsmw->segs, list)
+			vsmw_fmt_index(vsmw, s2, '+');
 		AZ(VSB_finish(vsmw->vsb));
 		XXXAZ(VSB_tofile(fd, vsmw->vsb)); // XXX handle ENOSPC? #2764
 		closefd(&fd);
 		AZ(renameat(vsmw->vdirfd, t, vsmw->vdirfd, vsmw->idx));
 		REPLACE(t, NULL);
 	}
+	REPLACE(seg->class, NULL);
+	REPLACE(seg->id, NULL);
+	FREE_OBJ(seg);
 }
 
 /*--------------------------------------------------------------------*/
diff --git a/lib/libvarnishapi/vsm.c b/lib/libvarnishapi/vsm.c
index 51f9ccdf1..55d5186a6 100644
--- a/lib/libvarnishapi/vsm.c
+++ b/lib/libvarnishapi/vsm.c
@@ -463,7 +463,7 @@ vsm_vlu_plus(struct vsm *vd, struct vsm_set *vs, const char *line)
 
 	if (av[0] != NULL || ac < 4 || ac > 6) {
 		(void)(vsm_diag(vd,
-		    "vsm_refresh_set2: bad index (%d/%s)",
+		    "vsm_vlu_plus: bad index (%d/%s)",
 		    ac, av[0]));
 		VAV_Free(av);
 		return(-1);
@@ -496,6 +496,39 @@ vsm_vlu_plus(struct vsm *vd, struct vsm_set *vs, const char *line)
 	return (0);
 }
 
+static int
+vsm_vlu_minus(struct vsm *vd, struct vsm_set *vs, const char *line)
+{
+	char **av;
+	int ac;
+	struct vsm_seg *vg, *vg2;
+
+	av = VAV_Parse(line + 1, &ac, 0);
+
+	if (av[0] != NULL || ac < 4 || ac > 6) {
+		(void)(vsm_diag(vd,
+		    "vsm_vlu_minus: bad index (%d/%s)",
+		    ac, av[0]));
+		VAV_Free(av);
+		return(-1);
+	}
+
+	VTAILQ_FOREACH_SAFE(vg, &vs->segs, list, vg2) {
+		if (vsm_cmp_av(&vg->av[1], &av[1]))
+			continue;
+		VTAILQ_REMOVE(&vs->segs, vg, list);
+		if (vg->refs) {
+			vg->flags |= VSM_FLAG_STALE;
+			VTAILQ_INSERT_TAIL(&vs->stale, vg, list);
+		} else {
+			VAV_Free(vg->av);
+			FREE_OBJ(vg);
+		}
+		break;
+	}
+	return (0);
+}
+
 static int v_matchproto_(vlu_f)
 vsm_vlu_func(void *priv, const char *line)
 {
@@ -519,6 +552,9 @@ vsm_vlu_func(void *priv, const char *line)
 	case '+':
 		i = vsm_vlu_plus(vd, vs, line);
 		break;
+	case '-':
+		i = vsm_vlu_minus(vd, vs, line);
+		break;
 	default:
 		break;
 	}

From fgsch at lodoss.net  Fri Aug  2 11:31:09 2019
From: fgsch at lodoss.net (Federico G. Schwindt)
Date: Fri,  2 Aug 2019 11:31:09 +0000 (UTC)
Subject: [master] 87b335bcd Plug minor leak
Message-ID: <20190802113110.010A9A2ECC@lists.varnish-cache.org>


commit 87b335bcdddf006ec703e0f167605c40df059589
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Fri Aug 2 12:24:20 2019 +0100

    Plug minor leak

diff --git a/lib/libvarnishapi/vsm.c b/lib/libvarnishapi/vsm.c
index 55d5186a6..c220a31ee 100644
--- a/lib/libvarnishapi/vsm.c
+++ b/lib/libvarnishapi/vsm.c
@@ -526,6 +526,7 @@ vsm_vlu_minus(struct vsm *vd, struct vsm_set *vs, const char *line)
 		}
 		break;
 	}
+	VAV_Free(av);
 	return (0);
 }
 

From fgsch at lodoss.net  Fri Aug  2 11:31:10 2019
From: fgsch at lodoss.net (Federico G. Schwindt)
Date: Fri,  2 Aug 2019 11:31:10 +0000 (UTC)
Subject: [master] 63bb0b489 Dump non-printable chars as hex instead of octal
Message-ID: <20190802113110.1509FA2ED0@lists.varnish-cache.org>


commit 63bb0b489754ef3a228a2d84b0e648e157580f4e
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Fri Aug 2 12:25:19 2019 +0100

    Dump non-printable chars as hex instead of octal

diff --git a/bin/varnishtest/vtc_log.c b/bin/varnishtest/vtc_log.c
index 76935d6a8..1bdd5699c 100644
--- a/bin/varnishtest/vtc_log.c
+++ b/bin/varnishtest/vtc_log.c
@@ -227,7 +227,8 @@ vtc_dump(struct vtclog *vl, int lvl, const char *pfx, const char *str, int len)
 		if (len < 0)
 			len = strlen(str);
 		VSB_quote_pfx(vl->vsb, buf, str,
-		    len > MAX_DUMP ? MAX_DUMP : len, VSB_QUOTE_UNSAFE);
+		    len > MAX_DUMP ? MAX_DUMP : len,
+		    VSB_QUOTE_UNSAFE | VSB_QUOTE_ESCHEX);
 		if (len > MAX_DUMP)
 			VSB_printf(vl->vsb, "%s [...] (%d)\n",
 			    buf, len - MAX_DUMP);

From phk at FreeBSD.org  Mon Aug  5 08:38:11 2019
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Mon,  5 Aug 2019 08:38:11 +0000 (UTC)
Subject: [master] 93e6dd706 Constify
Message-ID: <20190805083811.3563BA7305@lists.varnish-cache.org>


commit 93e6dd706074d5f5815bd03e76d63fa30f6666c9
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Aug 5 05:43:37 2019 +0000

    Constify

diff --git a/bin/varnishd/http2/cache_http2.h b/bin/varnishd/http2/cache_http2.h
index a7a1001f5..430ab060c 100644
--- a/bin/varnishd/http2/cache_http2.h
+++ b/bin/varnishd/http2/cache_http2.h
@@ -223,8 +223,8 @@ void H2_Send_Frame(struct worker *, struct h2_sess *,
     h2_frame type, uint8_t flags, uint32_t len, uint32_t stream,
     const void *);
 
-void H2_Send_RST(struct worker *wrk, struct h2_sess *h2, struct h2_req *r2,
-    uint32_t stream, h2_error h2e);
+void H2_Send_RST(struct worker *wrk, struct h2_sess *h2,
+    const struct h2_req *r2, uint32_t stream, h2_error h2e);
 
 void H2_Send(struct worker *, struct h2_req *, h2_frame type, uint8_t flags,
     uint32_t len, const void *, uint64_t *acct);
diff --git a/bin/varnishd/http2/cache_http2_send.c b/bin/varnishd/http2/cache_http2_send.c
index 87b3ceb00..37f052d26 100644
--- a/bin/varnishd/http2/cache_http2_send.c
+++ b/bin/varnishd/http2/cache_http2_send.c
@@ -392,7 +392,7 @@ h2_send(struct worker *wrk, struct h2_req *r2, h2_frame ftyp, uint8_t flags,
 }
 
 void
-H2_Send_RST(struct worker *wrk, struct h2_sess *h2, struct h2_req *r2,
+H2_Send_RST(struct worker *wrk, struct h2_sess *h2, const struct h2_req *r2,
     uint32_t stream, h2_error h2e)
 {
 	char b[4];

From phk at FreeBSD.org  Mon Aug  5 08:38:11 2019
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Mon,  5 Aug 2019 08:38:11 +0000 (UTC)
Subject: [master] 6f2fee0a5 Fix locking mistake introduced in 5f97b89
Message-ID: <20190805083811.49B95A7308@lists.varnish-cache.org>


commit 6f2fee0a5b257586773ea790bd8f07a1a1c6258f
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Aug 5 08:27:34 2019 +0000

    Fix locking mistake introduced in 5f97b89

diff --git a/bin/varnishd/common/common_vsmw.c b/bin/varnishd/common/common_vsmw.c
index 4a01064e9..a747cf970 100644
--- a/bin/varnishd/common/common_vsmw.c
+++ b/bin/varnishd/common/common_vsmw.c
@@ -70,9 +70,29 @@ vsmw_dummy_lock(void)
 {
 }
 
+static int vsmw_haslock;
 vsm_lock_f *vsmw_lock = vsmw_dummy_lock;
 vsm_lock_f *vsmw_unlock = vsmw_dummy_lock;
 
+#define vsmw_assert_lock()	AN(vsmw_haslock)
+
+#define vsmw_do_lock() vsmw_do_lock_(__func__, __LINE__)
+
+#define vsmw_do_lock_(f, l) 				\
+	do {					\
+		vsmw_lock();			\
+		AZ(vsmw_haslock);		\
+		vsmw_haslock = 1;		\
+	} while(0)
+
+#define vsmw_do_unlock() vsmw_do_unlock_(__func__, __LINE__)
+#define vsmw_do_unlock_(f, l) 				\
+	do {					\
+		AN(vsmw_haslock);		\
+		vsmw_haslock = 0;		\
+		vsmw_unlock();			\
+	} while(0)
+
 /*--------------------------------------------------------------------*/
 
 struct vsmw_cluster {
@@ -153,6 +173,7 @@ vsmw_mkent(const struct vsmw *vsmw, const char *pfx)
 	uint64_t rn;
 
 	AN(pfx);
+	vsmw_assert_lock();
 	while (1) {
 		VSB_clear(vsmw->vsb);
 		VSB_printf(vsmw->vsb, "_.%s", pfx);
@@ -192,6 +213,7 @@ static void
 vsmw_addseg(struct vsmw *vsmw, struct vsmwseg *seg)
 {
 
+	vsmw_assert_lock();
 	VTAILQ_INSERT_TAIL(&vsmw->segs, seg, list);
 	vsmw_append_record(vsmw, seg, '+');
 	vsmw->nsegs++;
@@ -206,6 +228,7 @@ vsmw_delseg(struct vsmw *vsmw, struct vsmwseg *seg, int fixidx)
 	int fd;
 	struct vsmwseg *s2;
 
+	vsmw_assert_lock();
 	CHECK_OBJ_NOTNULL(vsmw, VSMW_MAGIC);
 	CHECK_OBJ_NOTNULL(seg, VSMWSEG_MAGIC);
 
@@ -283,7 +306,7 @@ VSMW_NewCluster(struct vsmw *vsmw, size_t len, const char *pfx)
 	struct vsmw_cluster *vc;
 	struct vsmwseg *seg;
 
-	vsmw_lock();
+	vsmw_do_lock();
 	vc = vsmw_newcluster(vsmw, len, pfx);
 
 	ALLOC_OBJ(seg, VSMWSEG_MAGIC);
@@ -295,12 +318,12 @@ VSMW_NewCluster(struct vsmw *vsmw, size_t len, const char *pfx)
 	REPLACE(seg->id, "");
 	vsmw_addseg(vsmw, seg);
 
-	vsmw_unlock();
+	vsmw_do_unlock();
 	return (vc);
 }
 
-void
-VSMW_DestroyCluster(struct vsmw *vsmw, struct vsmw_cluster **vsmcp)
+static void
+vsmw_DestroyCluster_locked(struct vsmw *vsmw, struct vsmw_cluster **vsmcp)
 {
 	struct vsmw_cluster *vc;
 
@@ -329,6 +352,15 @@ VSMW_DestroyCluster(struct vsmw *vsmw, struct vsmw_cluster **vsmcp)
 	FREE_OBJ(vc);
 }
 
+void
+VSMW_DestroyCluster(struct vsmw *vsmw, struct vsmw_cluster **vsmcp)
+{
+
+	vsmw_do_lock();
+	vsmw_DestroyCluster_locked(vsmw, vsmcp);
+	vsmw_do_unlock();
+}
+
 /*--------------------------------------------------------------------*/
 
 void *
@@ -338,7 +370,7 @@ VSMW_Allocv(struct vsmw *vsmw, struct vsmw_cluster *vc,
 {
 	struct vsmwseg *seg;
 
-	vsmw_lock();
+	vsmw_do_lock();
 	CHECK_OBJ_NOTNULL(vsmw, VSMW_MAGIC);
 	(void)vc;
 
@@ -365,7 +397,7 @@ VSMW_Allocv(struct vsmw *vsmw, struct vsmw_cluster *vc,
 
 	vsmw_addseg(vsmw, seg);
 
-	vsmw_unlock();
+	vsmw_do_unlock();
 	return (seg->ptr);
 }
 
@@ -390,7 +422,7 @@ VSMW_Free(struct vsmw *vsmw, void **pp)
 	struct vsmwseg *seg;
 	struct vsmw_cluster *cp;
 
-	vsmw_lock();
+	vsmw_do_lock();
 	CHECK_OBJ_NOTNULL(vsmw, VSMW_MAGIC);
 	AN(pp);
 	VTAILQ_FOREACH(seg, &vsmw->segs, list)
@@ -404,9 +436,8 @@ VSMW_Free(struct vsmw *vsmw, void **pp)
 	vsmw_delseg(vsmw, seg, 1);
 
 	if (!--cp->refs && cp->cseg == NULL)
-		VSMW_DestroyCluster(vsmw, &cp);
-
-	vsmw_unlock();
+		vsmw_DestroyCluster_locked(vsmw, &cp);
+	vsmw_do_unlock();
 }
 
 /*--------------------------------------------------------------------*/
@@ -421,7 +452,7 @@ VSMW_New(int vdirfd, int mode, const char *idxname)
 	assert(mode > 0);
 	AN(idxname);
 
-	vsmw_lock();
+	vsmw_do_lock();
 	ALLOC_OBJ(vsmw, VSMW_MAGIC);
 	AN(vsmw);
 
@@ -443,7 +474,7 @@ VSMW_New(int vdirfd, int mode, const char *idxname)
 	vsmw_idx_head(vsmw, fd);
 	closefd(&fd);
 
-	vsmw_unlock();
+	vsmw_do_unlock();
 	return (vsmw);
 }
 
@@ -453,7 +484,7 @@ VSMW_Destroy(struct vsmw **pp)
 	struct vsmw *vsmw;
 	struct vsmwseg *seg, *s2;
 
-	vsmw_lock();
+	vsmw_do_lock();
 	TAKE_OBJ_NOTNULL(vsmw, pp, VSMW_MAGIC);
 	VTAILQ_FOREACH_SAFE(seg, &vsmw->segs, list, s2)
 		vsmw_delseg(vsmw, seg, 0);
@@ -463,5 +494,5 @@ VSMW_Destroy(struct vsmw **pp)
 	VSB_destroy(&vsmw->vsb);
 	closefd(&vsmw->vdirfd);
 	FREE_OBJ(vsmw);
-	vsmw_unlock();
+	vsmw_do_unlock();
 }

From phk at FreeBSD.org  Mon Aug  5 08:38:11 2019
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Mon,  5 Aug 2019 08:38:11 +0000 (UTC)
Subject: [master] 8a58838a3 Add vct_is{upper|lower}()
Message-ID: <20190805083811.64F92A730B@lists.varnish-cache.org>


commit 8a58838a3575407e6140b16bb0a49870988e8444
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Aug 5 08:29:43 2019 +0000

    Add vct_is{upper|lower}()

diff --git a/include/vct.h b/include/vct.h
index 44021f72d..e9cf9be86 100644
--- a/include/vct.h
+++ b/include/vct.h
@@ -45,6 +45,8 @@
 #define VCT_IDENT		(VCT_ALPHA | VCT_DIGIT | VCT_ID)
 #define VCT_VT			(1<<12)
 #define VCT_SPACE		(VCT_LWS | VCT_VT)
+#define VCT_UPPER		(1<<13)
+#define VCT_LOWER		(1<<14)
 
 extern const uint16_t vct_typtab[256];
 
@@ -65,6 +67,8 @@ vct_is(int x, uint16_t y)
 #define vct_isspace(x) vct_is(x, VCT_SPACE)
 #define vct_isdigit(x) vct_is(x, VCT_DIGIT)
 #define vct_isalpha(x) vct_is(x, VCT_ALPHA)
+#define vct_islower(x) vct_is(x, VCT_LOWER)
+#define vct_isupper(x) vct_is(x, VCT_UPPER)
 #define vct_isalnum(x) vct_is(x, VCT_ALPHA | VCT_DIGIT)
 #define vct_issep(x) vct_is(x, VCT_SEPARATOR)
 #define vct_issepctl(x) vct_is(x, VCT_SEPARATOR | VCT_CTL)
diff --git a/lib/libvarnish/vct.c b/lib/libvarnish/vct.c
index a86e2e427..2bb540687 100644
--- a/lib/libvarnish/vct.c
+++ b/lib/libvarnish/vct.c
@@ -41,8 +41,8 @@
 
 /* NB: VCT always operate in ASCII, don't replace 0x0d with \r etc. */
 
-#define VCT_UPALPHA	VCT_ALPHA
-#define VCT_LOALPHA	VCT_ALPHA
+#define VCT_UPALPHA	(VCT_ALPHA | VCT_UPPER)
+#define VCT_LOALPHA	(VCT_ALPHA | VCT_LOWER)
 
 const uint16_t vct_typtab[256] = {
 	[0x00]	=	VCT_CTL,

From phk at FreeBSD.org  Mon Aug  5 08:38:11 2019
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Mon,  5 Aug 2019 08:38:11 +0000 (UTC)
Subject: [master] 1e4b687b0 Whitespace OCD
Message-ID: <20190805083811.7DB44A7311@lists.varnish-cache.org>


commit 1e4b687b0aa0a3c587ecdae124c03e01e2a6653f
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Aug 5 08:30:17 2019 +0000

    Whitespace OCD

diff --git a/bin/varnishd/common/common_vsmw.c b/bin/varnishd/common/common_vsmw.c
index a747cf970..c37b0d22e 100644
--- a/bin/varnishd/common/common_vsmw.c
+++ b/bin/varnishd/common/common_vsmw.c
@@ -78,7 +78,7 @@ vsm_lock_f *vsmw_unlock = vsmw_dummy_lock;
 
 #define vsmw_do_lock() vsmw_do_lock_(__func__, __LINE__)
 
-#define vsmw_do_lock_(f, l) 				\
+#define vsmw_do_lock_(f, l)				\
 	do {					\
 		vsmw_lock();			\
 		AZ(vsmw_haslock);		\
@@ -86,7 +86,7 @@ vsm_lock_f *vsmw_unlock = vsmw_dummy_lock;
 	} while(0)
 
 #define vsmw_do_unlock() vsmw_do_unlock_(__func__, __LINE__)
-#define vsmw_do_unlock_(f, l) 				\
+#define vsmw_do_unlock_(f, l)				\
 	do {					\
 		AN(vsmw_haslock);		\
 		vsmw_haslock = 0;		\

From phk at FreeBSD.org  Mon Aug  5 08:38:11 2019
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Mon,  5 Aug 2019 08:38:11 +0000 (UTC)
Subject: [master] 99d13d215 Add STRING.upper and STRING.lower
Message-ID: <20190805083811.982D5A7315@lists.varnish-cache.org>


commit 99d13d2152f8b7e35b61e61850096fe8d7e3f725
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Aug 5 08:30:30 2019 +0000

    Add STRING.upper and STRING.lower
    
    Relevant for #3023

diff --git a/bin/varnishd/cache/cache_vrt.c b/bin/varnishd/cache/cache_vrt.c
index 5e68b07d8..d943fe205 100644
--- a/bin/varnishd/cache/cache_vrt.c
+++ b/bin/varnishd/cache/cache_vrt.c
@@ -36,6 +36,7 @@
 #include "cache_objhead.h"
 #include "vav.h"
 #include "vcl.h"
+#include "vct.h"
 #include "vrt_obj.h"
 #include "vsa.h"
 #include "vtcp.h"
@@ -183,6 +184,7 @@ VPI_BundleStrands(int n, struct strands *s, char const **d, const char *f, ...)
 {
 	va_list ap;
 
+	assert(n > 0);
 	s->n = n;
 	s->p = d;
 	*d++ = f;
@@ -480,6 +482,57 @@ VRT_CollectStrands(VRT_CTX, VCL_STRANDS s)
 	return (b);
 }
 
+/*--------------------------------------------------------------------
+ * upper/lower-case STRANDS (onto workspace)
+ */
+
+#include <stdio.h>
+
+VCL_STRING
+VRT_UpperLowerStrands(VRT_CTX, VCL_STRANDS s, int up)
+{
+	unsigned u;
+	char *b, *e, *r;
+	const char *p, *q = NULL;
+	int i, copy = 0;
+
+	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
+	CHECK_OBJ_NOTNULL(ctx->ws, WS_MAGIC);
+	AN(s);
+	u = WS_ReserveAll(ctx->ws);
+	r = b = WS_Front(ctx->ws);
+	e = b + u;
+	for (i = 0; i < s->n; i++) {
+		if (s->p[i] == NULL || s->p[i][0] == '\0')
+			continue;
+		if (q != NULL)
+			copy = 1;
+		p = q = s->p[i];
+		for(p = q = s->p[i]; *p != '\0'; p++) {
+			if ((up && vct_islower(*p)) ||
+			    (!up && vct_isupper(*p))) {
+				*b++ = *p ^ 0x20;
+				copy = 1;
+			} else {
+				*b++ = *p;
+			}
+			if (b == e) {
+				WS_Release(ctx->ws, 0);
+				VRT_fail(ctx, "Workspace overflow");
+				return (NULL);
+			}
+		}
+	}
+	if (!copy) {
+		WS_Release(ctx->ws, 0);
+		return (q);
+	}
+	*b++ = '\0';
+	assert(b <= e);
+	WS_ReleaseP(ctx->ws, b);
+	return (r);
+}
+
 /*--------------------------------------------------------------------*/
 
 VCL_VOID
diff --git a/bin/varnishtest/tests/v00058.vtc b/bin/varnishtest/tests/v00058.vtc
index cef91e8b7..c7f39e628 100644
--- a/bin/varnishtest/tests/v00058.vtc
+++ b/bin/varnishtest/tests/v00058.vtc
@@ -174,3 +174,36 @@ client c1 {
 
 varnish v1 -expect client_resp_500 == 1
 varnish v1 -expect ws_client_overflow == 2
+
+# Test $STRINGS.{upper|lower}
+
+server s1 {
+	rxreq
+	txresp
+} -start
+
+varnish v1 -vcl+backend {
+	sub vcl_deliver {
+		set resp.http.l-proto = resp.proto.lower;
+		set resp.http.u-proto = resp.proto.upper;
+		set resp.http.l-req = req.url.lower;
+		set resp.http.u-req = req.url.upper;
+		set resp.http.l-mod = (req.url + "bar").lower;
+		set resp.http.u-mod = (req.url + "bar").upper;
+		set resp.http.uu-mod = (req.url + "bar").upper.upper;
+		set resp.http.ul-mod = (req.url + "bar").upper.lower;
+	}
+}
+
+client c1 {
+	txreq -url /foo
+	rxresp
+	expect resp.http.l-proto == "http/1.1"
+	expect resp.http.u-proto == "HTTP/1.1"
+	expect resp.http.l-req == "/foo"
+	expect resp.http.u-req == "/FOO"
+	expect resp.http.l-mod == "/foobar"
+	expect resp.http.u-mod == "/FOOBAR"
+	expect resp.http.uu-mod == "/FOOBAR"
+	expect resp.http.ul-mod == "/foobar"
+} -run
diff --git a/include/vrt.h b/include/vrt.h
index a288cb2fd..2a741c125 100644
--- a/include/vrt.h
+++ b/include/vrt.h
@@ -52,6 +52,7 @@
  * binary/load-time compatible, increment MAJOR version
  *
  * unreleased (planned for 2019-09-15)
+ *	VRT_UpperLowerStrands added.
  *	VRT_synth_page now takes STRANDS argument
  *	VRT_hashdata() now takes STRANDS argument
  *	VCL_BOOL VRT_Strands2Bool(VCL_STRANDS) added.
@@ -538,6 +539,7 @@ VCL_BOOL VRT_Strands2Bool(VCL_STRANDS);
 char *VRT_Strands(char *, size_t, VCL_STRANDS);
 VCL_STRING VRT_StrandsWS(struct ws *, const char *, VCL_STRANDS);
 VCL_STRING VRT_CollectStrands(VRT_CTX, VCL_STRANDS);
+VCL_STRING VRT_UpperLowerStrands(VRT_CTX, VCL_STRANDS s, int up);
 
 VCL_STRING VRT_BACKEND_string(VCL_BACKEND);
 VCL_STRING VRT_BOOL_string(VCL_BOOL);
diff --git a/lib/libvcc/vcc_expr.c b/lib/libvcc/vcc_expr.c
index 6776a3f86..b1ed9b64e 100644
--- a/lib/libvcc/vcc_expr.c
+++ b/lib/libvcc/vcc_expr.c
@@ -803,7 +803,7 @@ vcc_expr5(struct vcc *tl, struct expr **e, vcc_type_t fmt)
 /*--------------------------------------------------------------------
  * SYNTAX:
  *    Expr4:
- *      Expr5
+ *      Expr5 [ '.' type_method() ]*
  */
 
 static const struct vcc_methods {
@@ -818,6 +818,9 @@ static const struct vcc_methods {
 	{ STEVEDORE, vtype, #nm, "VRT_stevedore_" #nm "(\v1)"},
 #include "tbl/vrt_stv_var.h"
 
+	{ STRINGS, STRING, "upper", "VRT_UpperLowerStrands(ctx, \vT, 1)" },
+	{ STRINGS, STRING, "lower", "VRT_UpperLowerStrands(ctx, \vT, 0)" },
+
 	{ NULL, NULL,		NULL,		NULL},
 };
 
@@ -851,6 +854,11 @@ vcc_expr4(struct vcc *tl, struct expr **e, vcc_type_t fmt)
 		}
 		vcc_NextToken(tl);
 		*e = vcc_expr_edit(tl, vm->type_to, vm->impl, *e, NULL);
+		ERRCHK(tl);
+		if ((*e)->fmt == STRING) {
+			(*e)->fmt = STRINGS;
+			(*e)->nstr = 1;
+		}
 	}
 }
 

From phk at FreeBSD.org  Mon Aug  5 10:37:09 2019
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Mon,  5 Aug 2019 10:37:09 +0000 (UTC)
Subject: [master] 925a949eb Properly count vsm segments and rebuild _.index
 when retired segments dominate the _.index file.
Message-ID: <20190805103709.7B34DA9FFA@lists.varnish-cache.org>


commit 925a949ebcc85f28ce8605b040936d972c6f3e7a
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Aug 5 10:25:36 2019 +0000

    Properly count vsm segments and rebuild _.index when retired
    segments dominate the _.index file.

diff --git a/bin/varnishd/common/common_vsmw.c b/bin/varnishd/common/common_vsmw.c
index c37b0d22e..feb94cff9 100644
--- a/bin/varnishd/common/common_vsmw.c
+++ b/bin/varnishd/common/common_vsmw.c
@@ -204,7 +204,6 @@ vsmw_append_record(struct vsmw *vsmw, struct vsmwseg *seg, char act)
 	AZ(VSB_finish(vsmw->vsb));
 	XXXAZ(VSB_tofile(fd, vsmw->vsb)); // XXX handle ENOSPC? #2764
 	closefd(&fd);
-	vsmw->nsegs++;
 }
 
 /*--------------------------------------------------------------------*/
@@ -235,7 +234,7 @@ vsmw_delseg(struct vsmw *vsmw, struct vsmwseg *seg, int fixidx)
 	VTAILQ_REMOVE(&vsmw->segs, seg, list);
 
 	vsmw->nsegs--;
-	if (vsmw->nsubs < vsmw->nsegs || !fixidx) {
+	if (vsmw->nsubs * 2 < vsmw->nsegs || !fixidx) {
 		vsmw_append_record(vsmw, seg, '-');
 		vsmw->nsubs++;
 	} else {

From phk at FreeBSD.org  Mon Aug  5 10:37:09 2019
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Mon,  5 Aug 2019 10:37:09 +0000 (UTC)
Subject: [master] 368c3ba56 Test VSM _.index rewrites when more than half of
 the space is inert
Message-ID: <20190805103709.90319A9FFD@lists.varnish-cache.org>


commit 368c3ba5694afebb622eb2633a0848f9fa86d19f
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Aug 5 10:36:04 2019 +0000

    Test VSM _.index rewrites when more than half of the space is inert

diff --git a/bin/varnishtest/tests/c00083.vtc b/bin/varnishtest/tests/c00083.vtc
new file mode 100644
index 000000000..67f52b612
--- /dev/null
+++ b/bin/varnishtest/tests/c00083.vtc
@@ -0,0 +1,85 @@
+varnishtest "Test VSM _.index rewrite when too many deletes"
+
+varnish v1 -vcl {
+	backend default { .host = "${bad_ip}"; }
+} -start
+
+process p1 {
+	nlines=`wc -l < ${tmpdir}/v1/_.vsm_child/_.index`
+	nminus=`grep -c '^-' ${tmpdir}/v1/_.vsm_child/_.index`
+	echo NLINES $nlines NMINUS $nminus
+} -dump -run
+
+# The child process starts out with approx 37 VSM segments
+# so it takes 20 backends to cause a _.index rewrite.
+# Make it 25 to be safe.
+varnish v1 -vcl {
+	backend b00 { .host = "${bad_ip}"; }
+	backend b01 { .host = "${bad_ip}"; }
+	backend b02 { .host = "${bad_ip}"; }
+	backend b03 { .host = "${bad_ip}"; }
+	backend b04 { .host = "${bad_ip}"; }
+	backend b05 { .host = "${bad_ip}"; }
+	backend b06 { .host = "${bad_ip}"; }
+	backend b07 { .host = "${bad_ip}"; }
+	backend b08 { .host = "${bad_ip}"; }
+	backend b09 { .host = "${bad_ip}"; }
+	backend b10 { .host = "${bad_ip}"; }
+	backend b11 { .host = "${bad_ip}"; }
+	backend b12 { .host = "${bad_ip}"; }
+	backend b13 { .host = "${bad_ip}"; }
+	backend b14 { .host = "${bad_ip}"; }
+	backend b15 { .host = "${bad_ip}"; }
+	backend b16 { .host = "${bad_ip}"; }
+	backend b17 { .host = "${bad_ip}"; }
+	backend b18 { .host = "${bad_ip}"; }
+	backend b19 { .host = "${bad_ip}"; }
+	backend b20 { .host = "${bad_ip}"; }
+	backend b21 { .host = "${bad_ip}"; }
+	backend b22 { .host = "${bad_ip}"; }
+	backend b23 { .host = "${bad_ip}"; }
+	backend b24 { .host = "${bad_ip}"; }
+
+	sub vcl_recv {
+		set req.backend_hint = b00;
+		set req.backend_hint = b01;
+		set req.backend_hint = b02;
+		set req.backend_hint = b03;
+		set req.backend_hint = b04;
+		set req.backend_hint = b05;
+		set req.backend_hint = b06;
+		set req.backend_hint = b07;
+		set req.backend_hint = b08;
+		set req.backend_hint = b09;
+		set req.backend_hint = b10;
+		set req.backend_hint = b11;
+		set req.backend_hint = b12;
+		set req.backend_hint = b13;
+		set req.backend_hint = b14;
+		set req.backend_hint = b15;
+		set req.backend_hint = b16;
+		set req.backend_hint = b17;
+		set req.backend_hint = b18;
+		set req.backend_hint = b19;
+		set req.backend_hint = b20;
+		set req.backend_hint = b21;
+		set req.backend_hint = b22;
+		set req.backend_hint = b23;
+		set req.backend_hint = b24;
+	}
+}
+
+varnish v1 -cliok vcl.list
+
+process p1 -run
+
+varnish v1 -cliok "vcl.use vcl1"
+varnish v1 -cliok "vcl.discard vcl2"
+
+# Check that the _.index rewrite did happen
+process p1 {
+	nlines=`wc -l < ${tmpdir}/v1/_.vsm_child/_.index`
+	nminus=`grep -c '^-' ${tmpdir}/v1/_.vsm_child/_.index`
+	echo NLINES $nlines NMINUS $nminus
+	test $nminus -lt 25
+} -run

From martin at varnish-software.com  Mon Aug  5 11:06:08 2019
From: martin at varnish-software.com (Martin Blix Grydeland)
Date: Mon,  5 Aug 2019 11:06:08 +0000 (UTC)
Subject: [master] fb02b2993 Fix vcl.show for labels
Message-ID: <20190805110608.A64FAACB81@lists.varnish-cache.org>


commit fb02b2993bedfbeac37b7cb488f35d285b971b52
Author: Martin Blix Grydeland <martin at varnish-software.com>
Date:   Fri Aug 2 13:28:36 2019 +0200

    Fix vcl.show for labels
    
    When executing vcl.show for labels, show the VCL the label points to
    instead of asserting.

diff --git a/bin/varnishd/cache/cache_vcl.c b/bin/varnishd/cache/cache_vcl.c
index c50e44dd3..9adb3f431 100644
--- a/bin/varnishd/cache/cache_vcl.c
+++ b/bin/varnishd/cache/cache_vcl.c
@@ -876,6 +876,11 @@ vcl_cli_show(struct cli *cli, const char * const *av, void *priv)
 		return;
 	}
 	CHECK_OBJ_NOTNULL(vcl, VCL_MAGIC);
+	if (vcl->label) {
+		vcl = vcl->label;
+		CHECK_OBJ_NOTNULL(vcl, VCL_MAGIC);
+		AZ(vcl->label);
+	}
 	CHECK_OBJ_NOTNULL(vcl->conf, VCL_CONF_MAGIC);
 	if (verbose) {
 		for (i = 0; i < vcl->conf->nsrc; i++)
diff --git a/bin/varnishtest/tests/s00005.vtc b/bin/varnishtest/tests/s00005.vtc
index 0fa00990f..3ed6c0193 100644
--- a/bin/varnishtest/tests/s00005.vtc
+++ b/bin/varnishtest/tests/s00005.vtc
@@ -40,6 +40,8 @@ varnish v1 -cliok "vcl.label foo vcl2"
 varnish v1 -cliok "vcl.label bar vcl2"
 varnish v1 -cliok "vcl.list"
 varnish v1 -clijson "vcl.list -j"
+varnish v1 -cliok "vcl.show foo"
+varnish v1 -cliok "vcl.show -v bar"
 varnish v1 -clierr 300 "vcl.discard vcl2"
 varnish v1 -cliok "vcl.discard bar"
 varnish v1 -cliok "vcl.label foo vcl1"

From hermunn at varnish-software.com  Mon Aug  5 11:12:08 2019
From: hermunn at varnish-software.com (Pål Hermunn Johansen)
Date: Mon,  5 Aug 2019 11:12:08 +0000 (UTC)
Subject: [master] c91c1bb5c Document 1 second TTL on (synthetic) error objects
Message-ID: <20190805111208.F2749ACE9A@lists.varnish-cache.org>


commit c91c1bb5cde04d82c84e6f8e6a0ba0ee1a009a08
Author: P?l Hermunn Johansen <hermunn at varnish-software.com>
Date:   Thu Aug 1 13:49:08 2019 +0200

    Document 1 second TTL on (synthetic) error objects
    
    The behavior described here is old (see cache_fetch.c), but has
    not been cleanly documented in the docs.
    
    Fixes: #3024

diff --git a/doc/sphinx/users-guide/vcl-built-in-subs.rst b/doc/sphinx/users-guide/vcl-built-in-subs.rst
index fd5a58104..8d99efd59 100644
--- a/doc/sphinx/users-guide/vcl-built-in-subs.rst
+++ b/doc/sphinx/users-guide/vcl-built-in-subs.rst
@@ -509,8 +509,17 @@ Returning with `abandon`_ does not leave a cache object.
 
 If returning with ``deliver`` and a ``beresp.ttl > 0s``, a synthetic
 cache object is generated in VCL, whose body may be constructed using
-the ``synthetic()`` function. This may be useful to increase the
-efficiency of failing backend requests.
+the ``synthetic()`` function.
+
+When there is a waiting list on the object, the default ``ttl`` will
+be positive (currently one second), set before entering
+``vcl_backend_error``. This is to avoid request serialization and
+hammering on a potentially failing backend.
+
+Since these synthetic objects are cached in these special
+circumstances, be cautious with putting private information there. If
+you really must, then you need to explicitly set ``beresp.ttl`` to
+zero in ``vcl_backend_error``.
 
 The `vcl_backend_error` subroutine may terminate with calling ``return()``
 with one of the following keywords:

From fgsch at lodoss.net  Mon Aug  5 11:57:08 2019
From: fgsch at lodoss.net (Federico G. Schwindt)
Date: Mon,  5 Aug 2019 11:57:08 +0000 (UTC)
Subject: [master] 4503928e6 Document gunzip
Message-ID: <20190805115708.A25EDADD1B@lists.varnish-cache.org>


commit 4503928e6513a8500296962524e6fcefdff21a27
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Mon Aug 5 12:53:40 2019 +0100

    Document gunzip
    
    Fixes #3030.

diff --git a/bin/varnishtest/vtc_http.c b/bin/varnishtest/vtc_http.c
index 2df6cab45..e2f63d84c 100644
--- a/bin/varnishtest/vtc_http.c
+++ b/bin/varnishtest/vtc_http.c
@@ -755,6 +755,11 @@ cmd_http_rxresphdrs(CMD_ARGS)
 
 #define OVERHEAD 64L
 
+/* SECTION: client-server.spec.gunzip
+ *
+ * gunzip
+ *         Gunzip the body in place.
+ */
 static void
 cmd_http_gunzip(CMD_ARGS)
 {

From fgsch at lodoss.net  Mon Aug  5 14:28:09 2019
From: fgsch at lodoss.net (Federico G. Schwindt)
Date: Mon,  5 Aug 2019 14:28:09 +0000 (UTC)
Subject: [master] cd5ddaa64 Add gunzip for http2
Message-ID: <20190805142809.94E30B0C7F@lists.varnish-cache.org>


commit cd5ddaa64e0d3f5c2bca2b7998922e73b9d878e7
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Mon Aug 5 13:24:42 2019 +0100

    Add gunzip for http2
    
    While here also implement -gziplen and -gzipbody.
    
    Fixes #3031.

diff --git a/bin/varnishtest/Makefile.am b/bin/varnishtest/Makefile.am
index b9c1def06..dc67a98c0 100644
--- a/bin/varnishtest/Makefile.am
+++ b/bin/varnishtest/Makefile.am
@@ -38,6 +38,7 @@ varnishtest_SOURCES = \
 		vtc.c \
 		vtc_barrier.c \
 		vtc_client.c \
+		vtc_gzip.c \
 		vtc_haproxy.c \
 		vtc_h2_dectbl.h \
 		vtc_h2_enctbl.h \
diff --git a/bin/varnishtest/tests/a02026.vtc b/bin/varnishtest/tests/a02026.vtc
new file mode 100644
index 000000000..71bcca94d
--- /dev/null
+++ b/bin/varnishtest/tests/a02026.vtc
@@ -0,0 +1,29 @@
+varnishtest "Test -gzipbody and -gziplen"
+
+server s1 {
+	stream 1 {
+		rxreq
+		txresp -gzipbody "foo"
+	} -run
+
+	stream 3 {
+		rxreq
+		txresp -gziplen 10
+	} -run
+} -start
+
+client c1 -connect ${s1_sock} {
+	stream 1 {
+		txreq
+		rxresp
+		gunzip
+		expect resp.body == "foo"
+	} -run
+
+	stream 3 {
+		txreq
+		rxresp
+		gunzip
+		expect resp.bodylen == 10
+	} -run
+} -run
diff --git a/bin/varnishtest/vtc.h b/bin/varnishtest/vtc.h
index 50f5e8f1a..61c8dcb2d 100644
--- a/bin/varnishtest/vtc.h
+++ b/bin/varnishtest/vtc.h
@@ -130,6 +130,10 @@ void start_h2(struct http *hp);
 void stop_h2(struct http *hp);
 void b64_settings(const struct http *hp, const char *s);
 
+/* vtc_gzip.c */
+void vtc_gzip(struct http *, const char *, char **, unsigned *);
+void vtc_gunzip(struct http *, char *, unsigned *);
+
 /* vtc_subr.c */
 struct vsb *vtc_hex_to_bin(struct vtclog *vl, const char *arg);
 void vtc_expect(struct vtclog *, const char *, const char *, const char *,
diff --git a/bin/varnishtest/vtc_gzip.c b/bin/varnishtest/vtc_gzip.c
new file mode 100644
index 000000000..9eeb67a51
--- /dev/null
+++ b/bin/varnishtest/vtc_gzip.c
@@ -0,0 +1,134 @@
+/*-
+ * Copyright (c) 2008-2019 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.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "vtc.h"
+#include "vtc_http.h"
+#include "vgz.h"
+
+#define OVERHEAD 64L
+
+
+void
+vtc_gzip(struct http *hp, const char *input, char **body, unsigned *bodylen)
+{
+	unsigned l;
+	z_stream vz;
+#ifdef VGZ_EXTENSIONS
+	int i;
+#endif
+
+	memset(&vz, 0, sizeof vz);
+
+	l = strlen(input);
+	*body = calloc(1, l + OVERHEAD);
+	AN(*body);
+
+	vz.next_in = TRUST_ME(input);
+	vz.avail_in = l;
+
+	vz.next_out = TRUST_ME(*body);
+	vz.avail_out = l + OVERHEAD;
+
+	assert(Z_OK == deflateInit2(&vz,
+	    hp->gziplevel, Z_DEFLATED, 31, 9, Z_DEFAULT_STRATEGY));
+	assert(Z_STREAM_END == deflate(&vz, Z_FINISH));
+	*bodylen = vz.total_out;
+#ifdef VGZ_EXTENSIONS
+	i = vz.stop_bit & 7;
+	if (hp->gzipresidual >= 0 && hp->gzipresidual != i)
+		vtc_log(hp->vl, hp->fatal,
+		    "Wrong gzip residual got %d wanted %d",
+		    i, hp->gzipresidual);
+	vtc_log(hp->vl, 4, "startbit = %ju %ju/%ju",
+	    (uintmax_t)vz.start_bit,
+	    (uintmax_t)vz.start_bit >> 3, (uintmax_t)vz.start_bit & 7);
+	vtc_log(hp->vl, 4, "lastbit = %ju %ju/%ju",
+	    (uintmax_t)vz.last_bit,
+	    (uintmax_t)vz.last_bit >> 3, (uintmax_t)vz.last_bit & 7);
+	vtc_log(hp->vl, 4, "stopbit = %ju %ju/%ju",
+	    (uintmax_t)vz.stop_bit,
+	    (uintmax_t)vz.stop_bit >> 3, (uintmax_t)vz.stop_bit & 7);
+	assert(Z_OK == deflateEnd(&vz));
+#endif
+}
+
+void
+vtc_gunzip(struct http *hp, char *body, unsigned *bodylen)
+{
+	z_stream vz;
+	char *p;
+	unsigned l;
+	int i;
+
+	memset(&vz, 0, sizeof vz);
+
+	AN(body);
+	if (body[0] != (char)0x1f || body[1] != (char)0x8b)
+		vtc_log(hp->vl, hp->fatal,
+		    "Gunzip error: body lacks gzip magic");
+	vz.next_in = TRUST_ME(body);
+	vz.avail_in = *bodylen;
+
+	l = *bodylen * 10;
+	p = calloc(1, l);
+	AN(p);
+
+	vz.next_out = TRUST_ME(p);
+	vz.avail_out = l;
+
+	assert(Z_OK == inflateInit2(&vz, 31));
+	i = inflate(&vz, Z_FINISH);
+	assert(vz.total_out < l);
+	*bodylen = vz.total_out;
+	memcpy(body, p, *bodylen);
+	free(p);
+	vtc_log(hp->vl, 3, "new bodylen %u", *bodylen);
+	vtc_dump(hp->vl, 4, "body", body, *bodylen);
+	bprintf(hp->bodylen, "%u", *bodylen);
+#ifdef VGZ_EXTENSIONS
+	vtc_log(hp->vl, 4, "startbit = %ju %ju/%ju",
+	    (uintmax_t)vz.start_bit,
+	    (uintmax_t)vz.start_bit >> 3, (uintmax_t)vz.start_bit & 7);
+	vtc_log(hp->vl, 4, "lastbit = %ju %ju/%ju",
+	    (uintmax_t)vz.last_bit,
+	    (uintmax_t)vz.last_bit >> 3, (uintmax_t)vz.last_bit & 7);
+	vtc_log(hp->vl, 4, "stopbit = %ju %ju/%ju",
+	    (uintmax_t)vz.stop_bit,
+	    (uintmax_t)vz.stop_bit >> 3, (uintmax_t)vz.stop_bit & 7);
+#endif
+	if (i != Z_STREAM_END)
+		vtc_log(hp->vl, hp->fatal,
+		    "Gunzip error = %d (%s) in:%jd out:%jd",
+		    i, vz.msg, (intmax_t)vz.total_in, (intmax_t)vz.total_out);
+	assert(Z_OK == inflateEnd(&vz));
+	body[*bodylen] = '\0';
+}
diff --git a/bin/varnishtest/vtc_http.c b/bin/varnishtest/vtc_http.c
index e2f63d84c..8078ea645 100644
--- a/bin/varnishtest/vtc_http.c
+++ b/bin/varnishtest/vtc_http.c
@@ -749,12 +749,6 @@ cmd_http_rxresphdrs(CMD_ARGS)
 		    "Multiple Content-Length headers.\n");
 }
 
-/**********************************************************************
- * Ungzip rx'ed body
- */
-
-#define OVERHEAD 64L
-
 /* SECTION: client-server.spec.gunzip
  *
  * gunzip
@@ -763,107 +757,14 @@ cmd_http_rxresphdrs(CMD_ARGS)
 static void
 cmd_http_gunzip(CMD_ARGS)
 {
-	int i;
-	z_stream vz;
 	struct http *hp;
-	char *p;
-	unsigned l;
 
 	(void)av;
 	(void)cmd;
 	(void)vl;
-	CAST_OBJ_NOTNULL(hp, priv, HTTP_MAGIC);
 
-	memset(&vz, 0, sizeof vz);
-
-	AN(hp->body);
-	if (hp->body[0] != (char)0x1f || hp->body[1] != (char)0x8b)
-		vtc_log(hp->vl, hp->fatal,
-		    "Gunzip error: Body lacks gzip magics");
-	vz.next_in = TRUST_ME(hp->body);
-	vz.avail_in = hp->bodyl;
-
-	l = hp->bodyl * 10;
-	p = calloc(1, l);
-	AN(p);
-
-	vz.next_out = TRUST_ME(p);
-	vz.avail_out = l;
-
-	assert(Z_OK == inflateInit2(&vz, 31));
-	i = inflate(&vz, Z_FINISH);
-	assert(vz.total_out < l);
-	hp->bodyl = vz.total_out;
-	memcpy(hp->body, p, hp->bodyl);
-	free(p);
-	vtc_log(hp->vl, 3, "new bodylen %u", hp->bodyl);
-	vtc_dump(hp->vl, 4, "body", hp->body, hp->bodyl);
-	bprintf(hp->bodylen, "%u", hp->bodyl);
-#ifdef VGZ_EXTENSIONS
-	vtc_log(hp->vl, 4, "startbit = %ju %ju/%ju",
-	    (uintmax_t)vz.start_bit,
-	    (uintmax_t)vz.start_bit >> 3, (uintmax_t)vz.start_bit & 7);
-	vtc_log(hp->vl, 4, "lastbit = %ju %ju/%ju",
-	    (uintmax_t)vz.last_bit,
-	    (uintmax_t)vz.last_bit >> 3, (uintmax_t)vz.last_bit & 7);
-	vtc_log(hp->vl, 4, "stopbit = %ju %ju/%ju",
-	    (uintmax_t)vz.stop_bit,
-	    (uintmax_t)vz.stop_bit >> 3, (uintmax_t)vz.stop_bit & 7);
-#endif
-	if (i != Z_STREAM_END)
-		vtc_log(hp->vl, hp->fatal,
-		    "Gunzip error = %d (%s) in:%jd out:%jd",
-		    i, vz.msg, (intmax_t)vz.total_in, (intmax_t)vz.total_out);
-	assert(Z_OK == inflateEnd(&vz));
-	hp->body[hp->bodyl] = '\0';
-}
-
-/**********************************************************************
- * Create a gzip'ed body
- */
-
-static void
-gzip_body(const struct http *hp, const char *txt, char **body, int *bodylen)
-{
-	int l;
-	z_stream vz;
-#ifdef VGZ_EXTENSIONS
-	int i;
-#endif
-
-	memset(&vz, 0, sizeof vz);
-
-	l = strlen(txt);
-	*body = calloc(1, l + OVERHEAD);
-	AN(*body);
-
-	vz.next_in = TRUST_ME(txt);
-	vz.avail_in = l;
-
-	vz.next_out = TRUST_ME(*body);
-	vz.avail_out = l + OVERHEAD;
-
-	assert(Z_OK == deflateInit2(&vz,
-	    hp->gziplevel, Z_DEFLATED, 31, 9, Z_DEFAULT_STRATEGY));
-	assert(Z_STREAM_END == deflate(&vz, Z_FINISH));
-	*bodylen = vz.total_out;
-#ifdef VGZ_EXTENSIONS
-	i = vz.stop_bit & 7;
-	if (hp->gzipresidual >= 0 && hp->gzipresidual != i)
-		vtc_log(hp->vl, hp->fatal,
-		    "Wrong gzip residual got %d wanted %d",
-		    i, hp->gzipresidual);
-	vtc_log(hp->vl, 4, "startbit = %ju %ju/%ju",
-	    (uintmax_t)vz.start_bit,
-	    (uintmax_t)vz.start_bit >> 3, (uintmax_t)vz.start_bit & 7);
-	vtc_log(hp->vl, 4, "lastbit = %ju %ju/%ju",
-	    (uintmax_t)vz.last_bit,
-	    (uintmax_t)vz.last_bit >> 3, (uintmax_t)vz.last_bit & 7);
-	vtc_log(hp->vl, 4, "stopbit = %ju %ju/%ju",
-	    (uintmax_t)vz.stop_bit,
-	    (uintmax_t)vz.stop_bit >> 3, (uintmax_t)vz.stop_bit & 7);
-	assert(Z_OK == deflateEnd(&vz));
-#endif
+	CAST_OBJ_NOTNULL(hp, priv, HTTP_MAGIC);
+	vtc_gunzip(hp, hp->body, (unsigned *)&hp->bodyl);
 }
 
 /**********************************************************************
@@ -947,7 +848,7 @@ http_tx_parse_args(char * const *av, struct vtclog *vl, struct http *hp,
 			assert(body == nullbody);
 			free(body);
 			b = synth_body(av[1], 1);
-			gzip_body(hp, b, &body, &bodylen);
+			vtc_gzip(hp, b, &body, (unsigned *)&bodylen);
 			free(b);
 			VSB_printf(hp->vsb, "Content-Encoding: gzip%s", nl);
 			// vtc_hexdump(hp->vl, 4, "gzip", (void*)body, bodylen);
@@ -955,7 +856,7 @@ http_tx_parse_args(char * const *av, struct vtclog *vl, struct http *hp,
 		} else if (!strcmp(*av, "-gzipbody")) {
 			assert(body == nullbody);
 			free(body);
-			gzip_body(hp, av[1], &body, &bodylen);
+			vtc_gzip(hp, av[1], &body, (unsigned *)&bodylen);
 			VSB_printf(hp->vsb, "Content-Encoding: gzip%s", nl);
 			// vtc_hexdump(hp->vl, 4, "gzip", (void*)body, bodylen);
 			av++;
diff --git a/bin/varnishtest/vtc_http2.c b/bin/varnishtest/vtc_http2.c
index 74cea13bb..d915b7e51 100644
--- a/bin/varnishtest/vtc_http2.c
+++ b/bin/varnishtest/vtc_http2.c
@@ -43,6 +43,7 @@
 #include "vtc_http.h"
 
 #include "vfil.h"
+#include "vgz.h"
 #include "hpack.h"
 #include "vend.h"
 
@@ -1334,6 +1335,13 @@ cmd_sendhex(CMD_ARGS)
  *	Do the same thing as ``-body`` but generate an string of INT length
  *	for you.
  *
+ * \-gzipbody STRING (txreq, txresp)
+ *      Gzip STRING and send it as body.
+ *
+ * \-gziplen NUMBER (txreq, txresp)
+ *      Combine -body and -gzipbody: create a body of length NUMBER,
+ *      gzip it and send as body.
+ *
  * \-nostrend (txreq, txresp)
  *	Don't set the END_STREAM flag automatically, making the peer expect
  *	a body after the headers.
@@ -1386,7 +1394,7 @@ cmd_tx11obj(CMD_ARGS)
 	/*XXX: do we need a better api? yes we do */
 	struct hpk_hdr hdr;
 	char *cmd_str = *av;
-	char *p;
+	char *b, *p;
 	(void)cmd;
 
 	CAST_OBJ_NOTNULL(s, priv, STREAM_MAGIC);
@@ -1540,7 +1548,28 @@ cmd_tx11obj(CMD_ARGS)
 				bodylen = strlen(body);
 				f.flags &= ~END_STREAM;
 				av++;
-			}else if (AV_IS("-dep")) {
+			}
+			else if (!strcmp(*av, "-gzipbody")) {
+				AZ(body);
+				vtc_gzip(s->hp, av[1], &body,
+				    (unsigned *)&bodylen);
+				AN(body);
+				ENC(hdr, ":content-encoding", "gzip");
+				f.flags &= ~END_STREAM;
+				av++;
+			}
+			else if (!strcmp(*av, "-gziplen")) {
+				AZ(body);
+				b = synth_body(av[1], 1);
+				vtc_gzip(s->hp, b, &body,
+				    (unsigned *)&bodylen);
+				AN(body);
+				free(b);
+				ENC(hdr, ":content-encoding", "gzip");
+				f.flags &= ~END_STREAM;
+				av++;
+			}
+			else if (AV_IS("-dep")) {
 				STRTOU32_CHECK(stid, av, p, vl, "-dep", 0);
 				f.flags |= PRIORITY;
 			}
@@ -2438,6 +2467,27 @@ cmd_expect(CMD_ARGS)
 	AZ(pthread_mutex_unlock(&s->hp->mtx));
 }
 
+/* SECTION: stream.spec.gunzip gunzip
+ *
+ * Same as the ``gunzip`` command for HTTP/1.
+ */
+static void
+cmd_gunzip(CMD_ARGS)
+{
+	struct http *hp;
+	struct stream *s;
+
+	(void)av;
+	(void)cmd;
+	(void)vl;
+
+	CAST_OBJ_NOTNULL(s, priv, STREAM_MAGIC);
+	hp = s->hp;
+	CHECK_OBJ_NOTNULL(hp, HTTP_MAGIC);
+
+	vtc_gunzip(s->hp, s->body, (unsigned *)&s->bodylen);
+}
+
 /* SECTION: stream.spec.write_body
  *
  * write_body STRING
@@ -2469,6 +2519,7 @@ static const struct cmds stream_cmds[] = {
 #define CMD_STREAM(n) { #n, cmd_##n },
 	/* spec */
 	CMD_STREAM(expect)
+	CMD_STREAM(gunzip)
 	CMD_STREAM(rxcont)
 	CMD_STREAM(rxdata)
 	CMD_STREAM(rxframe)

From nils.goroll at uplex.de  Mon Aug  5 14:30:15 2019
From: nils.goroll at uplex.de (Nils Goroll)
Date: Mon,  5 Aug 2019 14:30:15 +0000 (UTC)
Subject: [master] dea77acca avoid null pointer deref in panic code
Message-ID: <20190805143015.6C19CB0E7A@lists.varnish-cache.org>


commit dea77acca891aff4f46fc60f61f37d018e3c22a2
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Sun Jul 21 13:03:38 2019 +0200

    avoid null pointer deref in panic code

diff --git a/bin/varnishd/cache/cache_panic.c b/bin/varnishd/cache/cache_panic.c
index 60a521ece..8a9c88775 100644
--- a/bin/varnishd/cache/cache_panic.c
+++ b/bin/varnishd/cache/cache_panic.c
@@ -533,7 +533,7 @@ pan_req(struct vsb *vsb, const struct req *req)
 	if (VALID_OBJ(req->htc, HTTP_CONN_MAGIC))
 		pan_htc(vsb, req->htc);
 	pan_http(vsb, "req", req->http);
-	if (req->resp->ws != NULL)
+	if (req->resp != NULL && req->resp->ws != NULL)
 		pan_http(vsb, "resp", req->resp);
 	if (req->vdc != NULL)
 		pan_vdp(vsb, req->vdc);

From phk at FreeBSD.org  Tue Aug  6 09:15:11 2019
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Tue,  6 Aug 2019 09:15:11 +0000 (UTC)
Subject: [master] 957dee5c7 Dont prefix function pointers with '*'
Message-ID: <20190806091511.999399B481@lists.varnish-cache.org>


commit 957dee5c7709a586d566cbb22c253d03829d6636
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Aug 6 08:05:00 2019 +0000

    Dont prefix function pointers with '*'

diff --git a/lib/libvcc/vmodtool.py b/lib/libvcc/vmodtool.py
index 79cff3ee8..fea8a955f 100755
--- a/lib/libvcc/vmodtool.py
+++ b/lib/libvcc/vmodtool.py
@@ -577,7 +577,7 @@ class Stanza(object):
             fmt_cstruct(
                 fo,
                 '.' + proto.cname() + ' =',
-                '*' + self.vcc.sympfx + proto.cname() + ','
+                self.vcc.sympfx + proto.cname() + ','
             )
 
     def cstruct(self, unused_fo, unused_define):
@@ -703,7 +703,7 @@ class EventStanza(Stanza):
         else:
             fmt_cstruct(fo,
                         "._event =",
-                        '*' + self.vcc.sympfx + self.event_func + ',')
+                        self.vcc.sympfx + self.event_func + ',')
 
     def json(self, jl):
         jl.append(["$EVENT", "%s._event" % self.vcc.csn])

From phk at FreeBSD.org  Tue Aug  6 09:15:11 2019
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Tue,  6 Aug 2019 09:15:11 +0000 (UTC)
Subject: [master] c5d0a9559 FlexeLinting: 'oper' is an incredibly bad global
 name.
Message-ID: <20190806091511.AED979B486@lists.varnish-cache.org>


commit c5d0a9559835c639ceef54d8c6a99834ebbefe74
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Aug 6 08:16:56 2019 +0000

    FlexeLinting: 'oper' is an incredibly bad global name.

diff --git a/bin/varnishd/cache/cache_ban.c b/bin/varnishd/cache/cache_ban.c
index 16e9351d7..dc4751d2c 100644
--- a/bin/varnishd/cache/cache_ban.c
+++ b/bin/varnishd/cache/cache_ban.c
@@ -70,8 +70,6 @@ static const char * const arg_name[BAN_ARGARRSZ + 1] = {
 	[BAN_ARGARRSZ] = NULL
 };
 
-extern const char * const oper[BAN_OPERARRSZ + 1];
-
 /*--------------------------------------------------------------------
  * Storage handling of bans
  */
@@ -806,7 +804,7 @@ ban_render(struct cli *cli, const uint8_t *bs, int quote)
 		else
 			VCLI_Out(cli, "%s", arg_name[BAN_ARGIDX(bt.arg1)]);
 
-		VCLI_Out(cli, " %s ", oper[BAN_OPERIDX(bt.oper)]);
+		VCLI_Out(cli, " %s ", ban_oper[BAN_OPERIDX(bt.oper)]);
 
 		if (BANS_HAS_ARG2_DOUBLE(bt.arg1)) {
 			vdur_render(buf, bt.arg2_double);
diff --git a/bin/varnishd/cache/cache_ban.h b/bin/varnishd/cache/cache_ban.h
index c4d04fa23..cd82aad38 100644
--- a/bin/varnishd/cache/cache_ban.h
+++ b/bin/varnishd/cache/cache_ban.h
@@ -145,6 +145,7 @@ extern struct ban * volatile ban_start;
 extern pthread_cond_t	ban_lurker_cond;
 extern uint64_t bans_persisted_bytes;
 extern uint64_t bans_persisted_fragmentation;
+extern const char * const ban_oper[BAN_OPERARRSZ + 1];
 
 void ban_mark_completed(struct ban *);
 unsigned ban_len(const uint8_t *banspec);
diff --git a/bin/varnishd/cache/cache_ban_build.c b/bin/varnishd/cache/cache_ban_build.c
index 228d18c4b..4c08fd639 100644
--- a/bin/varnishd/cache/cache_ban_build.c
+++ b/bin/varnishd/cache/cache_ban_build.c
@@ -76,7 +76,7 @@ static const unsigned arg_opervalid[BAN_ARGARRSZ + 1] = {
 static const char *arg_operhelp[BAN_ARGARRSZ + 1];
 
 // operators
-const char * const oper[BAN_OPERARRSZ + 1] = {
+const char * const ban_oper[BAN_OPERARRSZ + 1] = {
 #define OPER(op, str) [BAN_OPERIDX(op)] = (str),
 #include "tbl/ban_oper.h"
 	[BAN_OPERARRSZ] = NULL
@@ -205,7 +205,7 @@ ban_parse_oper(const char *p)
 	int i;
 
 	for (i = 0; i < BAN_OPERARRSZ; i++) {
-		if (!strcmp(p, oper[i]))
+		if (!strcmp(p, ban_oper[i]))
 			return (_BANS_OPER_OFF + i);
 	}
 	return (-1);
@@ -396,14 +396,14 @@ ban_build_arg_operhelp(struct vsb *vsb, int arg)
 		if ((mask & (1U << i)) == 0)
 			continue;
 		if (p == NULL)
-			p = oper[i];
+			p = ban_oper[i];
 		else if (n == NULL)
-			n = oper[i];
+			n = ban_oper[i];
 		else {
 			VSB_cat(vsb, p);
 			VSB_cat(vsb, ", ");
 			p = n;
-			n = oper[i];
+			n = ban_oper[i];
 		}
 	}
 

From phk at FreeBSD.org  Tue Aug  6 09:15:11 2019
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Tue,  6 Aug 2019 09:15:11 +0000 (UTC)
Subject: [master] 4b6958587 Silence Flexlint 9075 ("No prior declaration") for
 the bogo-structures.
Message-ID: <20190806091511.C7EA59B48B@lists.varnish-cache.org>


commit 4b695858761b2acc3a30ad92a5a6788db084d7a6
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Aug 6 08:17:42 2019 +0000

    Silence Flexlint 9075 ("No prior declaration") for the bogo-structures.

diff --git a/lib/libvmod_debug/vmod_debug.c b/lib/libvmod_debug/vmod_debug.c
index 2606ae274..83b102176 100644
--- a/lib/libvmod_debug/vmod_debug.c
+++ b/lib/libvmod_debug/vmod_debug.c
@@ -882,6 +882,8 @@ xyzzy_get_ip(VRT_CTX, struct vmod_priv *priv)
  * For testing import code on bad vmod files (m00003.vtc)
  */
 
+//lint -save -e9075 external symbol '...' defined without a prior declaration
+
 const struct vmod_data Vmod_wrong0_Data = {
 	.vrt_major =    0,
 	.vrt_minor =    0,
@@ -918,3 +920,5 @@ const struct vmod_data Vmod_wrong3_Data = {
 	.proto =	"blablabla",
 	.abi =		"abiblabla",
 };
+
+//lint -restore

From phk at FreeBSD.org  Tue Aug  6 09:15:11 2019
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Tue,  6 Aug 2019 09:15:11 +0000 (UTC)
Subject: [master] 338550eda FlexeLinting: Default is always last in switch,
 and there is one.
Message-ID: <20190806091511.E8F739B490@lists.varnish-cache.org>


commit 338550eda003a320a4a6d8b80eea7ab8066c9c8a
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Aug 6 08:19:07 2019 +0000

    FlexeLinting: Default is always last in switch, and there is one.

diff --git a/bin/varnishd/cache/cache_panic.c b/bin/varnishd/cache/cache_panic.c
index 8a9c88775..2580b4ada 100644
--- a/bin/varnishd/cache/cache_panic.c
+++ b/bin/varnishd/cache/cache_panic.c
@@ -725,8 +725,8 @@ pan_ic(const char *func, const char *file, int line, const char *cond,
 		    "Incomplete code in %s(), %s line %d:\n",
 		    func, file, line);
 		break;
-	default:
 	case VAS_ASSERT:
+	default:
 		VSB_printf(pan_vsb,
 		    "Assert error in %s(), %s line %d:\n"
 		    "  Condition(%s) not true.\n",
diff --git a/bin/varnishd/cache/cache_rfc2616.c b/bin/varnishd/cache/cache_rfc2616.c
index e2bffa216..e411f6aaf 100644
--- a/bin/varnishd/cache/cache_rfc2616.c
+++ b/bin/varnishd/cache/cache_rfc2616.c
@@ -126,9 +126,6 @@ RFC2616_Ttl(struct busyobj *bo, vtim_real now, vtim_real *t_origin,
 		h_date = VTIM_parse(p);
 
 	switch (http_GetStatus(hp)) {
-	default:
-		*ttl = -1.;
-		break;
 	case 302: /* Moved Temporarily */
 	case 307: /* Temporary Redirect */
 		/*
@@ -192,7 +189,10 @@ RFC2616_Ttl(struct busyobj *bo, vtim_real now, vtim_real *t_origin,
 			 */
 			*ttl = (int)(h_expires - h_date);
 		}
-
+		break;
+	default:
+		*ttl = -1.;
+		break;
 	}
 
 	/*
diff --git a/bin/varnishd/mgt/mgt_param.c b/bin/varnishd/mgt/mgt_param.c
index 5a1c0ca29..3a0b57f61 100644
--- a/bin/varnishd/mgt/mgt_param.c
+++ b/bin/varnishd/mgt/mgt_param.c
@@ -691,7 +691,8 @@ MCF_InitParams(struct cli *cli)
 /*--------------------------------------------------------------------*/
 
 void
-MCF_ParamConf(enum mcf_which_e which, const char *param, const char *fmt, ...)
+MCF_ParamConf(enum mcf_which_e which, const char * const param,
+    const char *fmt, ...)
 {
 	struct parspec *pp;
 	struct vsb *vsb;
@@ -718,6 +719,8 @@ MCF_ParamConf(enum mcf_which_e which, const char *param, const char *fmt, ...)
 		pp->max = strdup(VSB_data(vsb));
 		AN(pp->max);
 		break;
+	default:
+		WRONG("bad 'which'");
 	}
 	VSB_delete(vsb);
 }

From phk at FreeBSD.org  Tue Aug  6 09:15:12 2019
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Tue,  6 Aug 2019 09:15:12 +0000 (UTC)
Subject: [master] 6f63b8ef0 Flexelinting: Macros named _something are reserved
 for the compiler
Message-ID: <20190806091512.0CF599B496@lists.varnish-cache.org>


commit 6f63b8ef054ce89fc17926ecdf6e6d9badffb957
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Aug 6 08:32:50 2019 +0000

    Flexelinting: Macros named _something are reserved for the compiler

diff --git a/bin/varnishd/cache/cache_ban.h b/bin/varnishd/cache/cache_ban.h
index cd82aad38..4288f1297 100644
--- a/bin/varnishd/cache/cache_ban.h
+++ b/bin/varnishd/cache/cache_ban.h
@@ -77,7 +77,7 @@
 #define BANS_FLAG_NODEDUP	(1<<5)
 
 #define BANS_OPER_EQ		0x10
-#define _BANS_OPER_OFF		BANS_OPER_EQ
+#define BANS_OPER_OFF_		BANS_OPER_EQ
 #define BANS_OPER_NEQ		0x11
 #define BANS_OPER_MATCH		0x12
 #define BANS_OPER_NMATCH	0x13
@@ -85,14 +85,14 @@
 #define BANS_OPER_GTE		0x15
 #define BANS_OPER_LT		0x16
 #define BANS_OPER_LTE		0x17
-#define _BANS_OPER_LIM		(BANS_OPER_LTE + 1)
+#define BANS_OPER_LIM_		(BANS_OPER_LTE + 1)
 
-#define BAN_OPERIDX(x) ((x) - _BANS_OPER_OFF)
-#define BAN_OPERARRSZ  (_BANS_OPER_LIM - _BANS_OPER_OFF)
-#define ASSERT_BAN_OPER(x) assert((x) >= _BANS_OPER_OFF && (x) < _BANS_OPER_LIM)
+#define BAN_OPERIDX(x) ((x) - BANS_OPER_OFF_)
+#define BAN_OPERARRSZ  (BANS_OPER_LIM_ - BANS_OPER_OFF_)
+#define ASSERT_BAN_OPER(x) assert((x) >= BANS_OPER_OFF_ && (x) < BANS_OPER_LIM_)
 
 #define BANS_ARG_URL		0x18
-#define _BANS_ARG_OFF		BANS_ARG_URL
+#define BANS_ARG_OFF_		BANS_ARG_URL
 #define BANS_ARG_REQHTTP	0x19
 #define BANS_ARG_OBJHTTP	0x1a
 #define BANS_ARG_OBJSTATUS	0x1b
@@ -100,11 +100,11 @@
 #define BANS_ARG_OBJAGE	0x1d
 #define BANS_ARG_OBJGRACE	0x1e
 #define BANS_ARG_OBJKEEP	0x1f
-#define _BANS_ARG_LIM		(BANS_ARG_OBJKEEP + 1)
+#define BANS_ARG_LIM		(BANS_ARG_OBJKEEP + 1)
 
-#define BAN_ARGIDX(x) ((x) - _BANS_ARG_OFF)
-#define BAN_ARGARRSZ  (_BANS_ARG_LIM - _BANS_ARG_OFF)
-#define ASSERT_BAN_ARG(x) assert((x) >= _BANS_ARG_OFF && (x) < _BANS_ARG_LIM)
+#define BAN_ARGIDX(x) ((x) - BANS_ARG_OFF_)
+#define BAN_ARGARRSZ  (BANS_ARG_LIM - BANS_ARG_OFF_)
+#define ASSERT_BAN_ARG(x) assert((x) >= BANS_ARG_OFF_ && (x) < BANS_ARG_LIM)
 
 // has an arg1_spec (BANS_FLAG_HTTP at build time)
 #define BANS_HAS_ARG1_SPEC(arg)	\
diff --git a/bin/varnishd/cache/cache_ban_build.c b/bin/varnishd/cache/cache_ban_build.c
index 4c08fd639..441f71b93 100644
--- a/bin/varnishd/cache/cache_ban_build.c
+++ b/bin/varnishd/cache/cache_ban_build.c
@@ -206,7 +206,7 @@ ban_parse_oper(const char *p)
 
 	for (i = 0; i < BAN_OPERARRSZ; i++) {
 		if (!strcmp(p, ban_oper[i]))
-			return (_BANS_OPER_OFF + i);
+			return (BANS_OPER_OFF_ + i);
 	}
 	return (-1);
 }
@@ -251,7 +251,7 @@ BAN_AddTest(struct ban_proto *bp,
 	}
 
 	op = ban_parse_oper(a2);
-	if (op < _BANS_OPER_OFF ||
+	if (op < BANS_OPER_OFF_ ||
 	    ((1U << BAN_OPERIDX(op)) & arg_opervalid[BAN_ARGIDX(pv->tag)]) == 0)
 		return (ban_error(bp,
 		    "expected conditional (%s) got \"%s\"",
@@ -424,7 +424,7 @@ BAN_Build_Init(void) {
 	struct vsb *vsb = VSB_new_auto();
 	int i;
 
-	for (i = _BANS_ARG_OFF; i < _BANS_ARG_LIM; i ++) {
+	for (i = BANS_ARG_OFF_; i < BANS_ARG_LIM; i ++) {
 		VSB_clear(vsb);
 		ban_build_arg_operhelp(vsb, i);
 		AZ(VSB_finish(vsb));
diff --git a/lib/libvmod_directors/vmod_shard.c b/lib/libvmod_directors/vmod_shard.c
index 9de023190..3fd7fc605 100644
--- a/lib/libvmod_directors/vmod_shard.c
+++ b/lib/libvmod_directors/vmod_shard.c
@@ -93,11 +93,11 @@
 #define arg_healthy	((uint32_t)1 << 6)
 #define arg_param	((uint32_t)1 << 7)
 #define arg_resolve	((uint32_t)1 << 8)
-#define _arg_mask	((arg_resolve << 1) - 1)
+#define arg_mask_	((arg_resolve << 1) - 1)
 /* allowed in shard_param.set */
-#define _arg_mask_set	(arg_param - 1)
+#define arg_mask_set_	(arg_param - 1)
 /* allowed in shard_param */
-#define _arg_mask_param ( _arg_mask_set		\
+#define arg_mask_param_ ( arg_mask_set_		\
 			  & ~arg_key			\
 			  & ~arg_key_blob )
 
@@ -143,7 +143,7 @@ static const struct vmod_directors_shard_param shard_param_default = {
 	.defaults	= NULL,
 	.scope		= SCOPE_VMOD,
 
-	.mask		= _arg_mask_param,
+	.mask		= arg_mask_param_,
 	.by		= BY_HASH,
 	.healthy	= CHOSEN,
 	.rampup	= 1,
@@ -429,13 +429,13 @@ shard_param_merge(struct vmod_directors_shard_param *to,
 		  const struct vmod_directors_shard_param *from)
 {
 	CHECK_OBJ_NOTNULL(to, VMOD_SHARD_SHARD_PARAM_MAGIC);
-	assert((to->mask & ~_arg_mask_param) == 0);
+	assert((to->mask & ~arg_mask_param_) == 0);
 
-	if (to->mask == _arg_mask_param)
+	if (to->mask == arg_mask_param_)
 		return;
 
 	CHECK_OBJ_NOTNULL(from, VMOD_SHARD_SHARD_PARAM_MAGIC);
-	assert((from->mask & ~_arg_mask_param) == 0);
+	assert((from->mask & ~arg_mask_param_) == 0);
 
 	if ((to->mask & arg_by) == 0 && (from->mask & arg_by) != 0) {
 		to->by = from->by;
@@ -457,7 +457,7 @@ shard_param_merge(struct vmod_directors_shard_param *to,
 
 	to->mask |= from->mask;
 
-	if (to->mask == _arg_mask_param)
+	if (to->mask == arg_mask_param_)
 		return;
 
 	AN(from->defaults);
@@ -495,7 +495,7 @@ shard_blob_key(VCL_BLOB key_blob)
 #define tobit(args, name) ((args)->valid_##name ? arg_##name : 0)
 
 static uint32_t
-shard_backend_arg_mask(const struct VARGS(shard_backend) * const a)
+shard_backendarg_mask_(const struct VARGS(shard_backend) * const a)
 {
 	return (tobit(a, by)		|
 		tobit(a, key)		|
@@ -535,7 +535,7 @@ shard_param_args(VRT_CTX,
 	CHECK_OBJ_NOTNULL(p, VMOD_SHARD_SHARD_PARAM_MAGIC);
 	AN(p->vcl_name);
 
-	assert((args & ~_arg_mask_set) == 0);
+	assert((args & ~arg_mask_set_) == 0);
 
 	by = (args & arg_by) ? parse_by_e(by_s) : BY_HASH;
 	healthy = (args & arg_healthy) ? parse_healthy_e(healthy_s) : CHOSEN;
@@ -631,7 +631,7 @@ shard_param_args(VRT_CTX,
 	if (args & arg_healthy)
 		p->healthy = healthy;
 
-	p->mask = args & _arg_mask_param;
+	p->mask = args & arg_mask_param_;
 	return (p);
 }
 
@@ -643,11 +643,11 @@ vmod_shard_backend(VRT_CTX, struct vmod_directors_shard *vshard,
 	struct vmod_directors_shard_param *pp = NULL;
 	const struct vmod_directors_shard_param *ppt;
 	enum resolve_e resolve;
-	uint32_t args = shard_backend_arg_mask(a);
+	uint32_t args = shard_backendarg_mask_(a);
 
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
 	CHECK_OBJ_NOTNULL(vshard, VMOD_SHARD_SHARD_MAGIC);
-	assert((args & ~_arg_mask) == 0);
+	assert((args & ~arg_mask_) == 0);
 
 	if (args & arg_resolve)
 		resolve = parse_resolve_e(a->resolve);
@@ -703,7 +703,7 @@ vmod_shard_backend(VRT_CTX, struct vmod_directors_shard *vshard,
 	}
 
 	pp = shard_param_args(ctx, pp, "shard.backend()",
-			      args & _arg_mask_set,
+			      args & arg_mask_set_,
 			      a->by, a->key, a->key_blob, a->alt, a->warmup,
 			      a->rampup, a->healthy);
 	if (pp == NULL)
@@ -987,7 +987,7 @@ vmod_shard_param_set(VRT_CTX, struct vmod_directors_shard_param *p,
 {
 	uint32_t args = shard_param_set_mask(a);
 
-	assert((args & ~_arg_mask_set) == 0);
+	assert((args & ~arg_mask_set_) == 0);
 
 	p = shard_param_prep(ctx, p, "shard_param.set()");
 	if (p == NULL)

From phk at FreeBSD.org  Tue Aug  6 09:15:12 2019
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Tue,  6 Aug 2019 09:15:12 +0000 (UTC)
Subject: [master] d29aa566f Add some of FlexeLints "elective" messages.
Message-ID: <20190806091512.270019B49E@lists.varnish-cache.org>


commit d29aa566f811335b7108e13812df8b6e174fb685
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Aug 6 09:06:53 2019 +0000

    Add some of FlexeLints "elective" messages.

diff --git a/flint.lnt b/flint.lnt
index c043f969d..60b530678 100644
--- a/flint.lnt
+++ b/flint.lnt
@@ -5,6 +5,46 @@
 //d__flexelint_v9__=1
 +fan
 
+///////////////////////////////////////////////////////////////////////
+// electives
+//+e9*
+-e904
+-e935
+-e955   
+//+e958   // report internal struct padding
+//+e959   // report struct tail/size padding
+-e960
+-e964
+-e970
+-e9012
+-e9021
+-e9022
+-e9024
+-e9026
+-e9034
+-e9042
+-e9067
++e9071	// defined macro '...' is reserved to the compiler
++e9075	// external symbol without declaration
+-esym(9075, main)
+-e9085
+-e9107
+-e9109
+-e9113
+-e9131
+-e9132
+-e9133
+-e9136
+-e9140
+-e9141
+-e9147	// we dont use & on func_pointers
+-e9149
+-e9158
+-e9159
+-e9165
+///////////////////////////////////////////////////////////////////////
+
+
 -emacro((835),*)	// A zero has been given as ___ argument to operator '___
 
 ///////////////////////////////////////////////////////////////////////

From phk at FreeBSD.org  Tue Aug  6 09:15:12 2019
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Tue,  6 Aug 2019 09:15:12 +0000 (UTC)
Subject: [master] 11c385ea7 FlexeLinting: remove pointless and slightly wrong
 terminating entry
Message-ID: <20190806091512.3F03E9B4A4@lists.varnish-cache.org>


commit 11c385ea730b7563399e12aca20154ab65527f2f
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Aug 6 09:07:32 2019 +0000

    FlexeLinting: remove pointless and slightly wrong terminating entry

diff --git a/bin/varnishd/mgt/mgt_param_bits.c b/bin/varnishd/mgt/mgt_param_bits.c
index 7ea66d7e1..8fc6f61b9 100644
--- a/bin/varnishd/mgt/mgt_param_bits.c
+++ b/bin/varnishd/mgt/mgt_param_bits.c
@@ -109,7 +109,6 @@ bit_tweak(struct vsb *vsb, uint8_t *p, unsigned l, const char *arg,
 static const char * const VSL_tags[256] = {
 #  define SLTM(foo,flags,sdesc,ldesc) [SLT_##foo] = #foo,
 #  include "tbl/vsl_tags.h"
-	NULL
 };
 
 static int

From phk at FreeBSD.org  Tue Aug  6 11:57:09 2019
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Tue,  6 Aug 2019 11:57:09 +0000 (UTC)
Subject: [master] a17c1c999 Slightly better layout of generated C source for
 arg structs
Message-ID: <20190806115709.C4505A24AA@lists.varnish-cache.org>


commit a17c1c999b6d8d0d01ee5972b3f29f3237e3ba34
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Aug 6 11:19:34 2019 +0000

    Slightly better layout of generated C source for arg structs

diff --git a/lib/libvcc/vcc_expr.c b/lib/libvcc/vcc_expr.c
index b1ed9b64e..054b2ef56 100644
--- a/lib/libvcc/vcc_expr.c
+++ b/lib/libvcc/vcc_expr.c
@@ -570,7 +570,7 @@ vcc_func(struct vcc *tl, struct expr **e, const void *priv,
 	}
 
 	if (sa != NULL)
-		e1 = vcc_mk_expr(rfmt, "%s(ctx%s,\v+ &(%s){\n",
+		e1 = vcc_mk_expr(rfmt, "%s(ctx%s,\v+\n&(%s)\v+ {\n",
 		    cfunc, extra, sa);
 	else
 		e1 = vcc_mk_expr(rfmt, "%s(ctx%s\v+", cfunc, extra);
@@ -607,7 +607,7 @@ vcc_func(struct vcc *tl, struct expr **e, const void *priv,
 		free(fa);
 	}
 	if (sa != NULL) {
-		*e = vcc_expr_edit(tl, e1->fmt, "\v1\n})\v-", e1, NULL);
+		*e = vcc_expr_edit(tl, e1->fmt, "\v1\v-\n}\v-\n)", e1, NULL);
 	} else {
 		*e = vcc_expr_edit(tl, e1->fmt, "\v1\v-\n)", e1, NULL);
 	}

From fgsch at lodoss.net  Tue Aug  6 13:31:08 2019
From: fgsch at lodoss.net (Federico G. Schwindt)
Date: Tue,  6 Aug 2019 13:31:08 +0000 (UTC)
Subject: [master] b62cff9b7 return miss is no longer available in hit
Message-ID: <20190806133108.9E435A468D@lists.varnish-cache.org>


commit b62cff9b772abc802df4379766658686fe8f3cb6
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Tue Aug 6 14:29:20 2019 +0100

    return miss is no longer available in hit
    
    Also update svg and dot files.
    
    Reported on irc by idl0r.

diff --git a/doc/graphviz/cache_req_fsm.dot b/doc/graphviz/cache_req_fsm.dot
index bf777fdcd..2b84550a2 100644
--- a/doc/graphviz/cache_req_fsm.dot
+++ b/doc/graphviz/cache_req_fsm.dot
@@ -121,7 +121,7 @@ digraph cache_req_fsm {
 		]
 		lookup2 [
 			 shape=record
-			 label="{<top>cnt_lookup:|{vcl_hit\{\}|{req.*|obj.*}}|{fail|<deliver>deliver|<pass>pass|restart|synth|<miss>miss}}"
+			 label="{<top>cnt_lookup:|{vcl_hit\{\}|{req.*|obj.*}}|{fail|<deliver>deliver|<pass>pass|restart|synth}}"
 		]
 	}
 	lookup:busy:s -> lookup:top:ne [label=" waitinglist",
diff --git a/doc/graphviz/cache_req_fsm.svg b/doc/graphviz/cache_req_fsm.svg
index 97da4c954..8c2315d7e 100644
--- a/doc/graphviz/cache_req_fsm.svg
+++ b/doc/graphviz/cache_req_fsm.svg
@@ -1,505 +1,573 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.38.0 (20140413.2041)
+<!-- Generated by graphviz version 2.40.1 (20161225.0304)
  -->
 <!-- Title: cache_req_fsm Pages: 1 -->
-<svg width="1045pt" height="1242pt"
- viewBox="18.00 18.00 1027.00 1224.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(22 1220)">
+<svg width="1046pt" height="1253pt"
+ viewBox="18.00 18.00 1027.78 1235.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(22 1231)">
 <title>cache_req_fsm</title>
-<polygon fill="white" stroke="none" points="-4,4 -4,-1202 1005,-1202 1005,4 -4,4"/>
-<g id="clust3" class="cluster"><title>cluster_backend</title>
-<polygon fill="aliceblue" stroke="aliceblue" points="215.5,-299 215.5,-408 506.5,-408 506.5,-299 215.5,-299"/>
+<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-1213 1005.7832,-1213 1005.7832,4 -4,4"/>
+<g id="clust3" class="cluster">
+<title>cluster_backend</title>
+<polygon fill="#f0f8ff" stroke="#f0f8ff" points="174.4761,-294 174.4761,-441 470.4761,-441 470.4761,-294 174.4761,-294"/>
 </g>
 <!-- acceptor -->
-<g id="node1" class="node"><title>acceptor</title>
-<polygon fill="none" stroke="black" points="711.108,-1101.5 669.804,-1119.5 587.196,-1119.5 545.892,-1101.5 587.196,-1083.5 669.804,-1083.5 711.108,-1101.5"/>
-<text text-anchor="middle" x="628.5" y="-1097.8" font-family="Times,serif" font-size="14.00">Request received</text>
+<g id="node1" class="node">
+<title>acceptor</title>
+<polygon fill="none" stroke="#000000" points="712.3771,-1113.5 671.4266,-1131.5 589.5256,-1131.5 548.575,-1113.5 589.5256,-1095.5 671.4266,-1095.5 712.3771,-1113.5"/>
+<text text-anchor="middle" x="630.4761" y="-1109.3" font-family="Times,serif" font-size="14.00" fill="#000000">Request received</text>
 </g>
 <!-- recv -->
-<g id="node5" class="node"><title>recv</title>
-<polygon fill="none" stroke="black" points="518.5,-971.5 518.5,-1040.5 850.5,-1040.5 850.5,-971.5 518.5,-971.5"/>
-<text text-anchor="middle" x="684.5" y="-1025.3" font-family="Times,serif" font-size="14.00">cnt_recv:</text>
-<polyline fill="none" stroke="black" points="518.5,-1017.5 850.5,-1017.5 "/>
-<text text-anchor="middle" x="609.5" y="-1002.3" font-family="Times,serif" font-size="14.00">vcl_recv{}</text>
-<polyline fill="none" stroke="black" points="700.5,-994.5 700.5,-1017.5 "/>
-<text text-anchor="middle" x="775.5" y="-1002.3" font-family="Times,serif" font-size="14.00">req.*</text>
-<polyline fill="none" stroke="black" points="518.5,-994.5 850.5,-994.5 "/>
-<text text-anchor="middle" x="536" y="-979.3" font-family="Times,serif" font-size="14.00">fail</text>
-<polyline fill="none" stroke="black" points="553.5,-971.5 553.5,-994.5 "/>
-<text text-anchor="middle" x="574" y="-979.3" font-family="Times,serif" font-size="14.00">hash</text>
-<polyline fill="none" stroke="black" points="594.5,-971.5 594.5,-994.5 "/>
-<text text-anchor="middle" x="618" y="-979.3" font-family="Times,serif" font-size="14.00">purge</text>
-<polyline fill="none" stroke="black" points="641.5,-971.5 641.5,-994.5 "/>
-<text text-anchor="middle" x="661.5" y="-979.3" font-family="Times,serif" font-size="14.00">pass</text>
-<polyline fill="none" stroke="black" points="681.5,-971.5 681.5,-994.5 "/>
-<text text-anchor="middle" x="701.5" y="-979.3" font-family="Times,serif" font-size="14.00">pipe</text>
-<polyline fill="none" stroke="black" points="721.5,-971.5 721.5,-994.5 "/>
-<text text-anchor="middle" x="746.5" y="-979.3" font-family="Times,serif" font-size="14.00">restart</text>
-<polyline fill="none" stroke="black" points="771.5,-971.5 771.5,-994.5 "/>
-<text text-anchor="middle" x="794.5" y="-979.3" font-family="Times,serif" font-size="14.00">synth</text>
-<polyline fill="none" stroke="black" points="817.5,-971.5 817.5,-994.5 "/>
-<text text-anchor="middle" x="834" y="-979.3" font-family="Times,serif" font-size="14.00">vcl</text>
+<g id="node5" class="node">
+<title>recv</title>
+<polygon fill="none" stroke="#000000" points="517.1851,-987.5 517.1851,-1053.5 851.7671,-1053.5 851.7671,-987.5 517.1851,-987.5"/>
+<text text-anchor="middle" x="684.4761" y="-1038.3" font-family="Times,serif" font-size="14.00" fill="#000000">cnt_recv:</text>
+<polyline fill="none" stroke="#000000" points="517.1851,-1031.5 851.7671,-1031.5 "/>
+<text text-anchor="middle" x="609.0015" y="-1016.3" font-family="Times,serif" font-size="14.00" fill="#000000">vcl_recv{}</text>
+<polyline fill="none" stroke="#000000" points="700.8179,-1009.5 700.8179,-1031.5 "/>
+<text text-anchor="middle" x="776.0059" y="-1016.3" font-family="Times,serif" font-size="14.00" fill="#000000">req.*</text>
+<polyline fill="none" stroke="#000000" points="517.1851,-1009.5 851.7671,-1009.5 "/>
+<text text-anchor="middle" x="534.5127" y="-994.3" font-family="Times,serif" font-size="14.00" fill="#000000">fail</text>
+<polyline fill="none" stroke="#000000" points="551.8403,-987.5 551.8403,-1009.5 "/>
+<text text-anchor="middle" x="572.6714" y="-994.3" font-family="Times,serif" font-size="14.00" fill="#000000">hash</text>
+<polyline fill="none" stroke="#000000" points="593.5024,-987.5 593.5024,-1009.5 "/>
+<text text-anchor="middle" x="617.3174" y="-994.3" font-family="Times,serif" font-size="14.00" fill="#000000">purge</text>
+<polyline fill="none" stroke="#000000" points="641.1323,-987.5 641.1323,-1009.5 "/>
+<text text-anchor="middle" x="661.1875" y="-994.3" font-family="Times,serif" font-size="14.00" fill="#000000">pass</text>
+<polyline fill="none" stroke="#000000" points="681.2427,-987.5 681.2427,-1009.5 "/>
+<text text-anchor="middle" x="701.2944" y="-994.3" font-family="Times,serif" font-size="14.00" fill="#000000">pipe</text>
+<polyline fill="none" stroke="#000000" points="721.3462,-987.5 721.3462,-1009.5 "/>
+<text text-anchor="middle" x="746.8359" y="-994.3" font-family="Times,serif" font-size="14.00" fill="#000000">restart</text>
+<polyline fill="none" stroke="#000000" points="772.3257,-987.5 772.3257,-1009.5 "/>
+<text text-anchor="middle" x="795.4946" y="-994.3" font-family="Times,serif" font-size="14.00" fill="#000000">synth</text>
+<polyline fill="none" stroke="#000000" points="818.6636,-987.5 818.6636,-1009.5 "/>
+<text text-anchor="middle" x="835.2153" y="-994.3" font-family="Times,serif" font-size="14.00" fill="#000000">vcl</text>
 </g>
 <!-- acceptor&#45;&gt;recv -->
-<g id="edge2" class="edge"><title>acceptor&#45;&gt;recv</title>
-<path fill="none" stroke="black" stroke-width="2" d="M638.771,-1083.35C644.514,-1073.76 651.946,-1061.35 659.143,-1049.34"/>
-<polygon fill="black" stroke="black" stroke-width="2" points="662.179,-1051.08 664.315,-1040.7 656.174,-1047.48 662.179,-1051.08"/>
+<g id="edge2" class="edge">
+<title>acceptor&#45;&gt;recv</title>
+<path fill="none" stroke="#000000" stroke-width="2" d="M641.1447,-1095.1262C646.6313,-1085.6772 653.5589,-1073.7462 660.256,-1062.2123"/>
+<polygon fill="#000000" stroke="#000000" stroke-width="2" points="663.31,-1063.9228 665.3047,-1053.5174 657.2565,-1060.4078 663.31,-1063.9228"/>
 </g>
 <!-- label_select -->
-<g id="node2" class="node"><title>label_select</title>
-<polygon fill="none" stroke="black" points="819.559,-1101.5 797.029,-1119.5 751.971,-1119.5 729.441,-1101.5 751.971,-1083.5 797.029,-1083.5 819.559,-1101.5"/>
-<text text-anchor="middle" x="774.5" y="-1097.8" font-family="Times,serif" font-size="14.00">LABEL</text>
+<g id="node2" class="node">
+<title>label_select</title>
+<polygon fill="none" stroke="#000000" points="819.1136,-1113.5 796.7948,-1131.5 752.1573,-1131.5 729.8385,-1113.5 752.1573,-1095.5 796.7948,-1095.5 819.1136,-1113.5"/>
+<text text-anchor="middle" x="774.4761" y="-1109.3" font-family="Times,serif" font-size="14.00" fill="#000000">LABEL</text>
 </g>
 <!-- label_select&#45;&gt;recv -->
-<g id="edge3" class="edge"><title>label_select&#45;&gt;recv</title>
-<path fill="none" stroke="black" stroke-width="2" d="M757.993,-1083.35C748.405,-1073.39 735.887,-1060.39 723.906,-1047.94"/>
-<polygon fill="black" stroke="black" stroke-width="2" points="726.397,-1045.48 716.94,-1040.7 721.354,-1050.33 726.397,-1045.48"/>
+<g id="edge3" class="edge">
+<title>label_select&#45;&gt;recv</title>
+<path fill="none" stroke="#000000" stroke-width="2" d="M756.695,-1095.1262C747.1922,-1085.3066 735.0954,-1072.8066 723.5317,-1060.8574"/>
+<polygon fill="#000000" stroke="#000000" stroke-width="2" points="725.8978,-1058.2695 716.4284,-1053.5174 720.8675,-1063.1375 725.8978,-1058.2695"/>
 </g>
 <!-- ESI_REQ -->
-<g id="node3" class="node"><title>ESI_REQ</title>
-<polygon fill="none" stroke="black" points="527.578,-1101.5 497.539,-1119.5 437.461,-1119.5 407.422,-1101.5 437.461,-1083.5 497.539,-1083.5 527.578,-1101.5"/>
-<text text-anchor="middle" x="467.5" y="-1097.8" font-family="Times,serif" font-size="14.00">ESI request</text>
+<g id="node3" class="node">
+<title>ESI_REQ</title>
+<polygon fill="none" stroke="#000000" points="530.533,-1113.5 501.0045,-1131.5 441.9476,-1131.5 412.4192,-1113.5 441.9476,-1095.5 501.0045,-1095.5 530.533,-1113.5"/>
+<text text-anchor="middle" x="471.4761" y="-1109.3" font-family="Times,serif" font-size="14.00" fill="#000000">ESI request</text>
 </g>
 <!-- ESI_REQ&#45;&gt;recv -->
-<g id="edge1" class="edge"><title>ESI_REQ&#45;&gt;recv</title>
-<path fill="none" stroke="black" d="M501.884,-1085.68C527.555,-1074.62 563.829,-1058.99 597.291,-1044.58"/>
-<polygon fill="black" stroke="black" points="598.844,-1047.72 606.643,-1040.55 596.074,-1041.29 598.844,-1047.72"/>
+<g id="edge1" class="edge">
+<title>ESI_REQ&#45;&gt;recv</title>
+<path fill="none" stroke="#000000" d="M506.1723,-1098.351C531.3859,-1087.3422 566.6499,-1071.9452 599.1673,-1057.7475"/>
+<polygon fill="#000000" stroke="#000000" points="600.9403,-1060.7925 608.7043,-1053.5835 598.1392,-1054.3773 600.9403,-1060.7925"/>
 </g>
 <!-- RESTART -->
-<g id="node4" class="node"><title>RESTART</title>
-<text text-anchor="middle" x="919.5" y="-1176.3" font-family="Times,serif" font-size="14.00">RESTART</text>
+<g id="node4" class="node">
+<title>RESTART</title>
+<text text-anchor="middle" x="919.4761" y="-1186.8" font-family="Times,serif" font-size="14.00" fill="#000000">RESTART</text>
 </g>
 <!-- restart -->
-<g id="node24" class="node"><title>restart</title>
-<polygon fill="none" stroke="grey" points="838,-1078.5 838,-1124.5 1001,-1124.5 1001,-1078.5 838,-1078.5"/>
-<text text-anchor="middle" x="919.5" y="-1109.3" font-family="Times,serif" font-size="14.00" fill="grey">cnt_restart:</text>
-<polyline fill="none" stroke="grey" points="838,-1101.5 1001,-1101.5 "/>
-<text text-anchor="middle" x="855.5" y="-1086.3" font-family="Times,serif" font-size="14.00" fill="grey">fail</text>
-<polyline fill="none" stroke="grey" points="873,-1078.5 873,-1101.5 "/>
-<text text-anchor="middle" x="891" y="-1086.3" font-family="Times,serif" font-size="14.00" fill="grey">ok?</text>
-<polyline fill="none" stroke="grey" points="909,-1078.5 909,-1101.5 "/>
-<text text-anchor="middle" x="955" y="-1086.3" font-family="Times,serif" font-size="14.00" fill="grey">max_restarts?</text>
+<g id="node24" class="node">
+<title>restart</title>
+<polygon fill="none" stroke="#c0c0c0" points="837.1689,-1091.5 837.1689,-1135.5 1001.7832,-1135.5 1001.7832,-1091.5 837.1689,-1091.5"/>
+<text text-anchor="middle" x="919.4761" y="-1120.3" font-family="Times,serif" font-size="14.00" fill="#c0c0c0">cnt_restart:</text>
+<polyline fill="none" stroke="#c0c0c0" points="837.1689,-1113.5 1001.7832,-1113.5 "/>
+<text text-anchor="middle" x="854.4966" y="-1098.3" font-family="Times,serif" font-size="14.00" fill="#c0c0c0">fail</text>
+<polyline fill="none" stroke="#c0c0c0" points="871.8242,-1091.5 871.8242,-1113.5 "/>
+<text text-anchor="middle" x="889.9312" y="-1098.3" font-family="Times,serif" font-size="14.00" fill="#c0c0c0">ok?</text>
+<polyline fill="none" stroke="#c0c0c0" points="908.0381,-1091.5 908.0381,-1113.5 "/>
+<text text-anchor="middle" x="954.9106" y="-1098.3" font-family="Times,serif" font-size="14.00" fill="#c0c0c0">max_restarts?</text>
 </g>
 <!-- RESTART&#45;&gt;restart -->
-<g id="edge30" class="edge"><title>RESTART&#45;&gt;restart</title>
-<path fill="none" stroke="purple" d="M919.5,-1161.64C919.5,-1153.7 919.5,-1144.02 919.5,-1134.81"/>
-<polygon fill="purple" stroke="purple" points="923,-1134.74 919.5,-1124.74 916,-1134.74 923,-1134.74"/>
+<g id="edge30" class="edge">
+<title>RESTART&#45;&gt;restart</title>
+<path fill="none" stroke="#a020f0" d="M919.4761,-1172.6336C919.4761,-1164.5682 919.4761,-1154.8557 919.4761,-1145.6545"/>
+<polygon fill="#a020f0" stroke="#a020f0" points="922.9762,-1145.5982 919.4761,-1135.5982 915.9762,-1145.5982 922.9762,-1145.5982"/>
 </g>
 <!-- hash -->
-<g id="node26" class="node"><title>hash</title>
-<polygon fill="none" stroke="black" points="578.5,-864.5 578.5,-933.5 700.5,-933.5 700.5,-864.5 578.5,-864.5"/>
-<text text-anchor="middle" x="639.5" y="-918.3" font-family="Times,serif" font-size="14.00">cnt_recv:</text>
-<polyline fill="none" stroke="black" points="578.5,-910.5 700.5,-910.5 "/>
-<text text-anchor="middle" x="617.5" y="-895.3" font-family="Times,serif" font-size="14.00">vcl_hash{}</text>
-<polyline fill="none" stroke="black" points="656.5,-887.5 656.5,-910.5 "/>
-<text text-anchor="middle" x="678.5" y="-895.3" font-family="Times,serif" font-size="14.00">req.*</text>
-<polyline fill="none" stroke="black" points="578.5,-887.5 700.5,-887.5 "/>
-<text text-anchor="middle" x="639.5" y="-872.3" font-family="Times,serif" font-size="14.00">lookup</text>
+<g id="node26" class="node">
+<title>hash</title>
+<polygon fill="none" stroke="#000000" points="577.6855,-883.5 577.6855,-949.5 701.2666,-949.5 701.2666,-883.5 577.6855,-883.5"/>
+<text text-anchor="middle" x="639.4761" y="-934.3" font-family="Times,serif" font-size="14.00" fill="#000000">cnt_recv:</text>
+<polyline fill="none" stroke="#000000" points="577.6855,-927.5 701.2666,-927.5 "/>
+<text text-anchor="middle" x="617.2881" y="-912.3" font-family="Times,serif" font-size="14.00" fill="#000000">vcl_hash{}</text>
+<polyline fill="none" stroke="#000000" points="656.8906,-905.5 656.8906,-927.5 "/>
+<text text-anchor="middle" x="679.0786" y="-912.3" font-family="Times,serif" font-size="14.00" fill="#000000">req.*</text>
+<polyline fill="none" stroke="#000000" points="577.6855,-905.5 701.2666,-905.5 "/>
+<text text-anchor="middle" x="639.1304" y="-890.3" font-family="Times,serif" font-size="14.00" fill="#000000">lookup</text>
 </g>
 <!-- recv&#45;&gt;hash -->
-<g id="edge33" class="edge"><title>recv:hash&#45;&gt;hash</title>
-<path fill="none" stroke="green" stroke-width="2" d="M573.5,-971C573.5,-960.048 577.765,-950.075 584.127,-941.293"/>
-<polygon fill="green" stroke="green" stroke-width="2" points="586.835,-943.51 590.497,-933.568 581.434,-939.057 586.835,-943.51"/>
+<g id="edge33" class="edge">
+<title>recv:hash&#45;&gt;hash</title>
+<path fill="none" stroke="#00ff00" stroke-width="2" d="M572.4761,-987.5C572.4761,-976.3407 576.9083,-966.2249 583.4928,-957.3541"/>
+<polygon fill="#00ff00" stroke="#00ff00" stroke-width="2" points="586.2961,-959.4594 590.0795,-949.5632 580.9505,-954.9401 586.2961,-959.4594"/>
 </g>
 <!-- recv&#45;&gt;hash -->
-<g id="edge34" class="edge"><title>recv:pipe&#45;&gt;hash</title>
-<path fill="none" stroke="orange" stroke-width="2" d="M701.5,-971C701.5,-960.335 697.482,-950.498 691.491,-941.76"/>
-<polygon fill="orange" stroke="orange" stroke-width="2" points="694.127,-939.449 685.21,-933.727 688.613,-943.761 694.127,-939.449"/>
+<g id="edge34" class="edge">
+<title>recv:pipe&#45;&gt;hash</title>
+<path fill="none" stroke="#ffa500" stroke-width="2" d="M701.4761,-987.5C701.4761,-976.7108 697.3639,-966.7698 691.2576,-957.9556"/>
+<polygon fill="#ffa500" stroke="#ffa500" stroke-width="2" points="693.8067,-955.5363 684.8612,-949.8593 688.314,-959.8757 693.8067,-955.5363"/>
 </g>
 <!-- recv&#45;&gt;hash -->
-<g id="edge35" class="edge"><title>recv:pass&#45;&gt;hash</title>
-<path fill="none" stroke="red" stroke-width="2" d="M661.5,-971C661.5,-961.905 659.833,-952.437 657.416,-943.49"/>
-<polygon fill="red" stroke="red" stroke-width="2" points="660.682,-942.203 654.418,-933.658 653.987,-944.244 660.682,-942.203"/>
+<g id="edge35" class="edge">
+<title>recv:pass&#45;&gt;hash</title>
+<path fill="none" stroke="#ff0000" stroke-width="2" d="M661.4761,-987.5C661.4761,-978.2127 659.7374,-968.536 657.2375,-959.4227"/>
+<polygon fill="#ff0000" stroke="#ff0000" stroke-width="2" points="660.562,-958.326 654.2725,-949.8 653.8724,-960.3873 660.562,-958.326"/>
 </g>
 <!-- recv&#45;&gt;hash -->
-<g id="edge40" class="edge"><title>recv:purge:s&#45;&gt;hash</title>
-<path fill="none" stroke="purple" stroke-width="2" d="M617.5,-971C617.5,-961.905 619.167,-952.437 621.584,-943.49"/>
-<polygon fill="purple" stroke="purple" stroke-width="2" points="625.013,-944.244 624.582,-933.658 618.318,-942.203 625.013,-944.244"/>
+<g id="edge40" class="edge">
+<title>recv:s&#45;&gt;hash</title>
+<path fill="none" stroke="#a020f0" stroke-width="2" d="M617.4761,-987.5C617.4761,-978.2127 619.2148,-968.536 621.7146,-959.4227"/>
+<polygon fill="#a020f0" stroke="#a020f0" stroke-width="2" points="625.0797,-960.3873 624.6797,-949.8 618.3901,-958.326 625.0797,-960.3873"/>
 </g>
 <!-- vcl_label -->
-<g id="node28" class="node"><title>vcl_label</title>
-<text text-anchor="middle" x="834.5" y="-902.8" font-family="Times,serif" font-size="14.00">switch to vcl</text>
-<text text-anchor="middle" x="834.5" y="-887.8" font-family="Times,serif" font-size="14.00">LABEL</text>
+<g id="node28" class="node">
+<title>vcl_label</title>
+<text text-anchor="middle" x="835.4761" y="-919.3" font-family="Times,serif" font-size="14.00" fill="#000000">switch to vcl</text>
+<text text-anchor="middle" x="835.4761" y="-905.3" font-family="Times,serif" font-size="14.00" fill="#000000">LABEL</text>
 </g>
 <!-- recv&#45;&gt;vcl_label -->
-<g id="edge41" class="edge"><title>recv:vcl:s&#45;&gt;vcl_label</title>
-<path fill="none" stroke="black" d="M834.5,-971C834.5,-956.94 834.5,-941.314 834.5,-928.309"/>
-<polygon fill="black" stroke="black" points="838,-928.093 834.5,-918.093 831,-928.093 838,-928.093"/>
+<g id="edge41" class="edge">
+<title>recv:s&#45;&gt;vcl_label</title>
+<path fill="none" stroke="#000000" d="M835.4761,-987.5C835.4761,-973.4402 835.4761,-957.8143 835.4761,-944.8091"/>
+<polygon fill="#000000" stroke="#000000" points="838.9762,-944.5929 835.4761,-934.5929 831.9762,-944.5929 838.9762,-944.5929"/>
 </g>
 <!-- SYNTH -->
-<g id="node6" class="node"><title>SYNTH</title>
-<text text-anchor="middle" x="543.5" y="-313.3" font-family="Times,serif" font-size="14.00">SYNTH</text>
+<g id="node6" class="node">
+<title>SYNTH</title>
+<text text-anchor="middle" x="510.4761" y="-307.8" font-family="Times,serif" font-size="14.00" fill="#000000">SYNTH</text>
 </g>
 <!-- synth -->
-<g id="node12" class="node"><title>synth</title>
-<polygon fill="none" stroke="black" points="439,-158 439,-250 578,-250 578,-158 439,-158"/>
-<text text-anchor="middle" x="508.5" y="-234.8" font-family="Times,serif" font-size="14.00">cnt_synth:</text>
-<polyline fill="none" stroke="black" points="439,-227 578,-227 "/>
-<text text-anchor="middle" x="482" y="-200.3" font-family="Times,serif" font-size="14.00">vcl_synth{}</text>
-<polyline fill="none" stroke="black" points="525,-181 525,-227 "/>
-<text text-anchor="middle" x="551.5" y="-211.8" font-family="Times,serif" font-size="14.00">req.*</text>
-<polyline fill="none" stroke="black" points="525,-204 578,-204 "/>
-<text text-anchor="middle" x="551.5" y="-188.8" font-family="Times,serif" font-size="14.00">resp.*</text>
-<polyline fill="none" stroke="black" points="439,-181 578,-181 "/>
-<text text-anchor="middle" x="456.5" y="-165.8" font-family="Times,serif" font-size="14.00">fail</text>
-<polyline fill="none" stroke="black" points="474,-158 474,-181 "/>
-<text text-anchor="middle" x="501" y="-165.8" font-family="Times,serif" font-size="14.00">deliver</text>
-<polyline fill="none" stroke="black" points="528,-158 528,-181 "/>
-<text text-anchor="middle" x="553" y="-165.8" font-family="Times,serif" font-size="14.00">restart</text>
+<g id="node12" class="node">
+<title>synth</title>
+<polygon fill="none" stroke="#000000" points="404.2241,-157.5 404.2241,-245.5 544.728,-245.5 544.728,-157.5 404.2241,-157.5"/>
+<text text-anchor="middle" x="474.4761" y="-230.3" font-family="Times,serif" font-size="14.00" fill="#000000">cnt_synth:</text>
+<polyline fill="none" stroke="#000000" points="404.2241,-223.5 544.728,-223.5 "/>
+<text text-anchor="middle" x="447.6646" y="-197.3" font-family="Times,serif" font-size="14.00" fill="#000000">vcl_synth{}</text>
+<polyline fill="none" stroke="#000000" points="491.105,-179.5 491.105,-223.5 "/>
+<text text-anchor="middle" x="517.5171" y="-208.3" font-family="Times,serif" font-size="14.00" fill="#000000">req.*</text>
+<polyline fill="none" stroke="#000000" points="491.105,-201.5 543.9292,-201.5 "/>
+<text text-anchor="middle" x="517.5171" y="-186.3" font-family="Times,serif" font-size="14.00" fill="#000000">resp.*</text>
+<polyline fill="none" stroke="#000000" points="404.2241,-179.5 544.728,-179.5 "/>
+<text text-anchor="middle" x="421.5518" y="-164.3" font-family="Times,serif" font-size="14.00" fill="#000000">fail</text>
+<polyline fill="none" stroke="#000000" points="438.8794,-157.5 438.8794,-179.5 "/>
+<text text-anchor="middle" x="466.314" y="-164.3" font-family="Times,serif" font-size="14.00" fill="#000000">deliver</text>
+<polyline fill="none" stroke="#000000" points="493.7485,-157.5 493.7485,-179.5 "/>
+<text text-anchor="middle" x="519.2383" y="-164.3" font-family="Times,serif" font-size="14.00" fill="#000000">restart</text>
 </g>
 <!-- SYNTH&#45;&gt;synth -->
-<g id="edge10" class="edge"><title>SYNTH&#45;&gt;synth</title>
-<path fill="none" stroke="purple" d="M538.031,-298.656C534.72,-288.153 530.294,-274.117 525.878,-260.114"/>
-<polygon fill="purple" stroke="purple" points="529.182,-258.953 522.837,-250.468 522.506,-261.058 529.182,-258.953"/>
+<g id="edge10" class="edge">
+<title>SYNTH&#45;&gt;synth</title>
+<path fill="none" stroke="#a020f0" d="M504.5314,-293.7532C501.059,-283.0948 496.4788,-269.0362 491.9438,-255.1161"/>
+<polygon fill="#a020f0" stroke="#a020f0" points="495.251,-253.9686 488.8255,-245.5446 488.5954,-256.137 495.251,-253.9686"/>
 </g>
 <!-- FAIL -->
-<g id="node7" class="node"><title>FAIL</title>
-<text text-anchor="middle" x="619.5" y="-313.3" font-family="Times,serif" font-size="14.00">FAIL</text>
+<g id="node7" class="node">
+<title>FAIL</title>
+<text text-anchor="middle" x="586.4761" y="-307.8" font-family="Times,serif" font-size="14.00" fill="#000000">FAIL</text>
 </g>
 <!-- FAIL&#45;&gt;synth -->
-<g id="edge9" class="edge"><title>FAIL&#45;&gt;synth</title>
-<path fill="none" stroke="purple" d="M602.156,-298.656C591.048,-287.548 575.986,-272.486 561.191,-257.691"/>
-<polygon fill="purple" stroke="purple" points="563.514,-255.064 553.968,-250.468 558.564,-260.014 563.514,-255.064"/>
+<g id="edge9" class="edge">
+<title>FAIL&#45;&gt;synth</title>
+<path fill="none" stroke="#a020f0" d="M567.9816,-293.7532C556.5552,-282.4799 541.2734,-267.4028 526.3801,-252.7089"/>
+<polygon fill="#a020f0" stroke="#a020f0" points="528.6954,-250.0764 519.1186,-245.5446 523.7791,-255.0594 528.6954,-250.0764"/>
 </g>
 <!-- deliver -->
-<g id="node8" class="node"><title>deliver</title>
-<polygon fill="none" stroke="black" points="236,-146.5 236,-261.5 421,-261.5 421,-146.5 236,-146.5"/>
-<text text-anchor="middle" x="328.5" y="-246.3" font-family="Times,serif" font-size="14.00">cnt_deliver:</text>
-<polyline fill="none" stroke="black" points="236,-238.5 421,-238.5 "/>
-<text text-anchor="middle" x="328.5" y="-223.3" font-family="Times,serif" font-size="14.00">Filter obj.&#45;&gt;resp.</text>
-<polyline fill="none" stroke="black" points="236,-215.5 421,-215.5 "/>
-<text text-anchor="middle" x="292.5" y="-188.8" font-family="Times,serif" font-size="14.00">vcl_deliver{}</text>
-<polyline fill="none" stroke="black" points="349,-169.5 349,-215.5 "/>
-<text text-anchor="middle" x="385" y="-200.3" font-family="Times,serif" font-size="14.00">req.*</text>
-<polyline fill="none" stroke="black" points="349,-192.5 421,-192.5 "/>
-<text text-anchor="middle" x="385" y="-177.3" font-family="Times,serif" font-size="14.00">resp.*</text>
-<polyline fill="none" stroke="black" points="236,-169.5 421,-169.5 "/>
-<text text-anchor="middle" x="253.5" y="-154.3" font-family="Times,serif" font-size="14.00">fail</text>
-<polyline fill="none" stroke="black" points="271,-146.5 271,-169.5 "/>
-<text text-anchor="middle" x="296" y="-154.3" font-family="Times,serif" font-size="14.00">restart</text>
-<polyline fill="none" stroke="black" points="321,-146.5 321,-169.5 "/>
-<text text-anchor="middle" x="348" y="-154.3" font-family="Times,serif" font-size="14.00">deliver</text>
-<polyline fill="none" stroke="black" points="375,-146.5 375,-169.5 "/>
-<text text-anchor="middle" x="398" y="-154.3" font-family="Times,serif" font-size="14.00">synth</text>
+<g id="node8" class="node">
+<title>deliver</title>
+<polygon fill="none" stroke="#000000" points="199.0552,-146.5 199.0552,-256.5 385.897,-256.5 385.897,-146.5 199.0552,-146.5"/>
+<text text-anchor="middle" x="292.4761" y="-241.3" font-family="Times,serif" font-size="14.00" fill="#000000">cnt_deliver:</text>
+<polyline fill="none" stroke="#000000" points="199.0552,-234.5 385.897,-234.5 "/>
+<text text-anchor="middle" x="292.4761" y="-219.3" font-family="Times,serif" font-size="14.00" fill="#000000">Filter obj.&#45;&gt;resp.</text>
+<polyline fill="none" stroke="#000000" points="199.0552,-212.5 385.897,-212.5 "/>
+<text text-anchor="middle" x="256.2612" y="-186.3" font-family="Times,serif" font-size="14.00" fill="#000000">vcl_deliver{}</text>
+<polyline fill="none" stroke="#000000" points="313.4673,-168.5 313.4673,-212.5 "/>
+<text text-anchor="middle" x="349.3794" y="-197.3" font-family="Times,serif" font-size="14.00" fill="#000000">req.*</text>
+<polyline fill="none" stroke="#000000" points="313.4673,-190.5 385.2915,-190.5 "/>
+<text text-anchor="middle" x="349.3794" y="-175.3" font-family="Times,serif" font-size="14.00" fill="#000000">resp.*</text>
+<polyline fill="none" stroke="#000000" points="199.0552,-168.5 385.897,-168.5 "/>
+<text text-anchor="middle" x="216.3828" y="-153.3" font-family="Times,serif" font-size="14.00" fill="#000000">fail</text>
+<polyline fill="none" stroke="#000000" points="233.7104,-146.5 233.7104,-168.5 "/>
+<text text-anchor="middle" x="259.2002" y="-153.3" font-family="Times,serif" font-size="14.00" fill="#000000">restart</text>
+<polyline fill="none" stroke="#000000" points="284.6899,-146.5 284.6899,-168.5 "/>
+<text text-anchor="middle" x="312.1245" y="-153.3" font-family="Times,serif" font-size="14.00" fill="#000000">deliver</text>
+<polyline fill="none" stroke="#000000" points="339.5591,-146.5 339.5591,-168.5 "/>
+<text text-anchor="middle" x="362.728" y="-153.3" font-family="Times,serif" font-size="14.00" fill="#000000">synth</text>
 </g>
 <!-- V1D_Deliver -->
-<g id="node9" class="node"><title>V1D_Deliver</title>
-<ellipse fill="none" stroke="black" cx="411.5" cy="-91" rx="58.4896" ry="18"/>
-<text text-anchor="middle" x="411.5" y="-87.3" font-family="Times,serif" font-size="14.00">V1D_Deliver</text>
+<g id="node9" class="node">
+<title>V1D_Deliver</title>
+<ellipse fill="none" stroke="#000000" cx="376.4761" cy="-91" rx="58.4823" ry="18"/>
+<text text-anchor="middle" x="376.4761" y="-86.8" font-family="Times,serif" font-size="14.00" fill="#000000">V1D_Deliver</text>
 </g>
 <!-- deliver&#45;&gt;V1D_Deliver -->
-<g id="edge4" class="edge"><title>deliver:deliver:s&#45;&gt;V1D_Deliver</title>
-<path fill="none" stroke="green" stroke-width="2" d="M348.5,-146C340.656,-129.929 348.195,-117.61 360.688,-108.824"/>
-<polygon fill="green" stroke="green" stroke-width="2" points="362.713,-111.692 369.502,-103.558 359.122,-105.683 362.713,-111.692"/>
+<g id="edge4" class="edge">
+<title>deliver:s&#45;&gt;V1D_Deliver</title>
+<path fill="none" stroke="#00ff00" stroke-width="2" d="M312.4761,-146.5C304.7472,-130.3337 312.1366,-117.818 324.5111,-108.7984"/>
+<polygon fill="#00ff00" stroke="#00ff00" stroke-width="2" points="326.6027,-111.6197 333.2541,-103.3729 322.9117,-105.6718 326.6027,-111.6197"/>
 </g>
 <!-- deliver&#45;&gt;V1D_Deliver -->
-<g id="edge5" class="edge"><title>deliver:deliver:s&#45;&gt;V1D_Deliver</title>
-<path fill="none" stroke="red" stroke-width="2" d="M348.5,-146C348.5,-131.486 358.258,-120.033 370.093,-111.479"/>
-<polygon fill="red" stroke="red" stroke-width="2" points="372.033,-114.392 378.524,-106.018 368.228,-108.516 372.033,-114.392"/>
+<g id="edge5" class="edge">
+<title>deliver:s&#45;&gt;V1D_Deliver</title>
+<path fill="none" stroke="#ff0000" stroke-width="2" d="M312.4761,-146.5C312.4761,-131.8021 322.2295,-120.1217 334.1212,-111.3428"/>
+<polygon fill="#ff0000" stroke="#ff0000" stroke-width="2" points="336.1965,-114.1664 342.602,-105.7272 332.3318,-108.33 336.1965,-114.1664"/>
 </g>
 <!-- deliver&#45;&gt;V1D_Deliver -->
-<g id="edge6" class="edge"><title>deliver:deliver:s&#45;&gt;V1D_Deliver</title>
-<path fill="none" stroke="blue" stroke-width="2" d="M348.5,-146C355.127,-132.423 367.853,-121.523 380.392,-113.17"/>
-<polygon fill="blue" stroke="blue" stroke-width="2" points="382.353,-116.072 388.965,-107.793 378.633,-110.142 382.353,-116.072"/>
+<g id="edge6" class="edge">
+<title>deliver:s&#45;&gt;V1D_Deliver</title>
+<path fill="none" stroke="#0000ff" stroke-width="2" d="M312.4761,-146.5C319.0459,-132.7581 331.7437,-121.6539 344.3458,-113.0926"/>
+<polygon fill="#0000ff" stroke="#0000ff" stroke-width="2" points="346.4405,-115.9076 352.9786,-107.5707 342.6685,-110.0108 346.4405,-115.9076"/>
 </g>
 <!-- DONE -->
-<g id="node11" class="node"><title>DONE</title>
-<ellipse fill="none" stroke="black" cx="661.5" cy="-18" rx="35.194" ry="18"/>
-<text text-anchor="middle" x="661.5" y="-14.3" font-family="Times,serif" font-size="14.00">DONE</text>
+<g id="node11" class="node">
+<title>DONE</title>
+<ellipse fill="none" stroke="#000000" cx="604.4761" cy="-18" rx="34.8371" ry="18"/>
+<text text-anchor="middle" x="604.4761" y="-13.8" font-family="Times,serif" font-size="14.00" fill="#000000">DONE</text>
 </g>
 <!-- V1D_Deliver&#45;&gt;DONE -->
-<g id="edge8" class="edge"><title>V1D_Deliver&#45;&gt;DONE</title>
-<path fill="none" stroke="black" d="M453.063,-78.1961C500.018,-64.8608 575.882,-43.3156 621.979,-30.224"/>
-<polygon fill="black" stroke="black" points="622.959,-33.5842 631.622,-27.4853 621.046,-26.8505 622.959,-33.5842"/>
+<g id="edge8" class="edge">
+<title>V1D_Deliver&#45;&gt;DONE</title>
+<path fill="none" stroke="#000000" d="M416.9752,-78.0332C458.8242,-64.6341 523.7103,-43.8592 565.1301,-30.5976"/>
+<polygon fill="#000000" stroke="#000000" points="566.4144,-33.8615 574.8709,-27.4789 564.2799,-27.1949 566.4144,-33.8615"/>
 </g>
 <!-- stream -->
-<g id="node10" class="node"><title>stream</title>
-<ellipse fill="turquoise" stroke="turquoise" cx="637.5" cy="-204" rx="41.9398" ry="26.7407"/>
-<text text-anchor="middle" x="637.5" y="-207.8" font-family="Times,serif" font-size="14.00">stream?</text>
-<text text-anchor="middle" x="637.5" y="-192.8" font-family="Times,serif" font-size="14.00">body</text>
+<g id="node10" class="node">
+<title>stream</title>
+<ellipse fill="#40e0d0" stroke="#40e0d0" cx="604.4761" cy="-201.5" rx="42.1901" ry="25.4118"/>
+<text text-anchor="middle" x="604.4761" y="-204.3" font-family="Times,serif" font-size="14.00" fill="#000000">stream?</text>
+<text text-anchor="middle" x="604.4761" y="-190.3" font-family="Times,serif" font-size="14.00" fill="#000000">body</text>
 </g>
 <!-- stream&#45;&gt;V1D_Deliver -->
-<g id="edge7" class="edge"><title>stream&#45;&gt;V1D_Deliver</title>
-<path fill="none" stroke="black" stroke-dasharray="1,5" d="M620.97,-179.113C611.959,-167.662 599.914,-154.6 586.5,-146 551.906,-123.821 507.638,-110.273 472.282,-102.294"/>
-<polygon fill="black" stroke="black" points="472.604,-98.7831 462.09,-100.091 471.125,-105.625 472.604,-98.7831"/>
+<g id="edge7" class="edge">
+<title>stream&#45;&gt;V1D_Deliver</title>
+<path fill="none" stroke="#000000" stroke-dasharray="1,5" d="M587.5949,-177.9853C578.5778,-166.9085 566.6326,-154.3303 553.4761,-146 518.3124,-123.7355 473.4992,-109.9292 437.763,-101.7176"/>
+<polygon fill="#000000" stroke="#000000" points="438.4594,-98.2871 427.9398,-99.5475 436.9494,-105.1223 438.4594,-98.2871"/>
 </g>
 <!-- synth&#45;&gt;V1D_Deliver -->
-<g id="edge11" class="edge"><title>synth:del:s&#45;&gt;V1D_Deliver</title>
-<path fill="none" stroke="purple" d="M500.5,-157C500.5,-134.249 481.3,-118.61 460.735,-108.384"/>
-<polygon fill="purple" stroke="purple" points="462.124,-105.171 451.574,-104.195 459.212,-111.537 462.124,-105.171"/>
+<g id="edge11" class="edge">
+<title>synth:s&#45;&gt;V1D_Deliver</title>
+<path fill="none" stroke="#a020f0" d="M466.4761,-157.5C466.4761,-134.569 447.3436,-118.6467 426.7214,-108.1449"/>
+<polygon fill="#a020f0" stroke="#a020f0" points="428.0656,-104.9096 417.5255,-103.8336 425.0941,-111.2476 428.0656,-104.9096"/>
 </g>
 <!-- see backend graph -->
-<g id="node13" class="node"><title>see backend graph</title>
-<text text-anchor="middle" x="447.5" y="-386.3" font-family="Times,serif" font-size="14.00">see backend graph</text>
+<g id="node13" class="node">
+<title>see backend graph</title>
+<text text-anchor="middle" x="410.4761" y="-418.8" font-family="Times,serif" font-size="14.00" fill="#000000">see backend graph</text>
 </g>
 <!-- BGFETCH -->
-<g id="node14" class="node"><title>BGFETCH</title>
-<polygon fill="turquoise" stroke="turquoise" points="293.5,-408 215.5,-408 215.5,-372 293.5,-372 293.5,-408"/>
-<text text-anchor="middle" x="254.5" y="-386.3" font-family="Times,serif" font-size="14.00">BGFETCH</text>
+<g id="node14" class="node">
+<title>BGFETCH</title>
+<polygon fill="#40e0d0" stroke="#40e0d0" points="254.2625,-441 174.6897,-441 174.6897,-405 254.2625,-405 254.2625,-441"/>
+<text text-anchor="middle" x="214.4761" y="-418.8" font-family="Times,serif" font-size="14.00" fill="#000000">BGFETCH</text>
 </g>
 <!-- FETCH -->
-<g id="node15" class="node"><title>FETCH</title>
-<polygon fill="turquoise" stroke="turquoise" points="371,-408 312,-408 312,-372 371,-372 371,-408"/>
-<text text-anchor="middle" x="341.5" y="-386.3" font-family="Times,serif" font-size="14.00">FETCH</text>
+<g id="node15" class="node">
+<title>FETCH</title>
+<polygon fill="#40e0d0" stroke="#40e0d0" points="332.8149,-441 272.1372,-441 272.1372,-405 332.8149,-405 332.8149,-441"/>
+<text text-anchor="middle" x="302.4761" y="-418.8" font-family="Times,serif" font-size="14.00" fill="#000000">FETCH</text>
 </g>
 <!-- FETCH_DONE -->
-<g id="node16" class="node"><title>FETCH_DONE</title>
-<polygon fill="turquoise" stroke="turquoise" points="380.5,-335 276.5,-335 276.5,-299 380.5,-299 380.5,-335"/>
-<text text-anchor="middle" x="328.5" y="-313.3" font-family="Times,serif" font-size="14.00">FETCH_DONE</text>
+<g id="node16" class="node">
+<title>FETCH_DONE</title>
+<polygon fill="#40e0d0" stroke="#40e0d0" points="345.697,-330 239.2551,-330 239.2551,-294 345.697,-294 345.697,-330"/>
+<text text-anchor="middle" x="292.4761" y="-307.8" font-family="Times,serif" font-size="14.00" fill="#000000">FETCH_DONE</text>
 </g>
 <!-- FETCH&#45;&gt;FETCH_DONE -->
-<g id="edge16" class="edge"><title>FETCH&#45;&gt;FETCH_DONE</title>
-<path fill="none" stroke="black" stroke-dasharray="1,5" d="M338.353,-371.813C336.884,-363.789 335.1,-354.047 333.456,-345.069"/>
-<polygon fill="black" stroke="black" points="336.862,-344.235 331.618,-335.029 329.976,-345.496 336.862,-344.235"/>
+<g id="edge16" class="edge">
+<title>FETCH&#45;&gt;FETCH_DONE</title>
+<path fill="none" stroke="#000000" stroke-dasharray="1,5" d="M300.8248,-404.6706C299.2542,-387.2373 296.8678,-360.7482 295.048,-340.5489"/>
+<polygon fill="#000000" stroke="#000000" points="298.5131,-340.0022 294.1298,-330.3566 291.5413,-340.6304 298.5131,-340.0022"/>
 </g>
 <!-- FETCH_FAIL -->
-<g id="node17" class="node"><title>FETCH_FAIL</title>
-<polygon fill="turquoise" stroke="turquoise" points="494.5,-335 398.5,-335 398.5,-299 494.5,-299 494.5,-335"/>
-<text text-anchor="middle" x="446.5" y="-313.3" font-family="Times,serif" font-size="14.00">FETCH_FAIL</text>
+<g id="node17" class="node">
+<title>FETCH_FAIL</title>
+<polygon fill="#40e0d0" stroke="#40e0d0" points="461.393,-330 363.5592,-330 363.5592,-294 461.393,-294 461.393,-330"/>
+<text text-anchor="middle" x="412.4761" y="-307.8" font-family="Times,serif" font-size="14.00" fill="#000000">FETCH_FAIL</text>
 </g>
 <!-- FETCH&#45;&gt;FETCH_FAIL -->
-<g id="edge17" class="edge"><title>FETCH&#45;&gt;FETCH_FAIL</title>
-<path fill="none" stroke="black" stroke-dasharray="1,5" d="M366.65,-371.994C380.445,-362.666 397.735,-350.974 412.696,-340.858"/>
-<polygon fill="black" stroke="black" points="414.868,-343.614 421.191,-335.114 410.947,-337.816 414.868,-343.614"/>
+<g id="edge17" class="edge">
+<title>FETCH&#45;&gt;FETCH_FAIL</title>
+<path fill="none" stroke="#000000" stroke-dasharray="1,5" d="M320.6403,-404.6706C338.7924,-386.3536 366.8515,-358.0394 387.1784,-337.5276"/>
+<polygon fill="#000000" stroke="#000000" points="389.7319,-339.9233 394.2848,-330.3566 384.7597,-334.996 389.7319,-339.9233"/>
 </g>
 <!-- FETCH_DONE&#45;&gt;deliver -->
-<g id="edge14" class="edge"><title>FETCH_DONE&#45;&gt;deliver</title>
-<path fill="none" stroke="red" stroke-width="2" d="M323.438,-298.656C322.617,-291.065 322.095,-281.628 321.873,-271.691"/>
-<polygon fill="red" stroke="red" stroke-width="2" points="325.373,-271.595 321.751,-261.638 318.373,-271.68 325.373,-271.595"/>
+<g id="edge14" class="edge">
+<title>FETCH_DONE&#45;&gt;deliver</title>
+<path fill="none" stroke="#ff0000" stroke-width="2" d="M287.3098,-293.7532C286.5135,-286.0295 286.0175,-276.5203 285.8218,-266.5721"/>
+<polygon fill="#ff0000" stroke="#ff0000" stroke-width="2" points="289.3213,-266.4936 285.7261,-256.5274 282.3216,-266.5603 289.3213,-266.4936"/>
 </g>
 <!-- FETCH_DONE&#45;&gt;deliver -->
-<g id="edge15" class="edge"><title>FETCH_DONE&#45;&gt;deliver</title>
-<path fill="none" stroke="blue" stroke-width="2" d="M333.562,-298.656C334.383,-291.065 334.905,-281.628 335.127,-271.691"/>
-<polygon fill="blue" stroke="blue" stroke-width="2" points="338.627,-271.68 335.249,-261.638 331.627,-271.595 338.627,-271.68"/>
+<g id="edge15" class="edge">
+<title>FETCH_DONE&#45;&gt;deliver</title>
+<path fill="none" stroke="#0000ff" stroke-width="2" d="M297.6424,-293.7532C298.4386,-286.0295 298.9346,-276.5203 299.1304,-266.5721"/>
+<polygon fill="#0000ff" stroke="#0000ff" stroke-width="2" points="302.6305,-266.5603 299.226,-256.5274 295.6308,-266.4936 302.6305,-266.5603"/>
 </g>
 <!-- FETCH_FAIL&#45;&gt;synth -->
-<g id="edge13" class="edge"><title>FETCH_FAIL&#45;&gt;synth</title>
-<path fill="none" stroke="purple" d="M456.188,-298.656C462.167,-287.951 470.196,-273.576 478.167,-259.306"/>
-<polygon fill="purple" stroke="purple" points="481.282,-260.905 483.103,-250.468 475.171,-257.492 481.282,-260.905"/>
+<g id="edge13" class="edge">
+<title>FETCH_FAIL&#45;&gt;synth</title>
+<path fill="none" stroke="#a020f0" d="M422.7141,-293.7532C428.8094,-282.8898 436.8865,-268.4943 444.8434,-254.3132"/>
+<polygon fill="#a020f0" stroke="#a020f0" points="447.9223,-255.9783 449.7632,-245.5446 441.8176,-252.553 447.9223,-255.9783"/>
 </g>
 <!-- lookup2 -->
-<g id="node18" class="node"><title>lookup2</title>
-<polygon fill="none" stroke="black" points="0,-552.5 0,-644.5 267,-644.5 267,-552.5 0,-552.5"/>
-<text text-anchor="middle" x="133.5" y="-629.3" font-family="Times,serif" font-size="14.00">cnt_lookup:</text>
-<polyline fill="none" stroke="black" points="0,-621.5 267,-621.5 "/>
-<text text-anchor="middle" x="72.5" y="-594.8" font-family="Times,serif" font-size="14.00">vcl_hit{}</text>
-<polyline fill="none" stroke="black" points="145,-575.5 145,-621.5 "/>
-<text text-anchor="middle" x="206" y="-606.3" font-family="Times,serif" font-size="14.00">req.*</text>
-<polyline fill="none" stroke="black" points="145,-598.5 267,-598.5 "/>
-<text text-anchor="middle" x="206" y="-583.3" font-family="Times,serif" font-size="14.00">obj.*</text>
-<polyline fill="none" stroke="black" points="0,-575.5 267,-575.5 "/>
-<text text-anchor="middle" x="17.5" y="-560.3" font-family="Times,serif" font-size="14.00">fail</text>
-<polyline fill="none" stroke="black" points="35,-552.5 35,-575.5 "/>
-<text text-anchor="middle" x="62" y="-560.3" font-family="Times,serif" font-size="14.00">deliver</text>
-<polyline fill="none" stroke="black" points="89,-552.5 89,-575.5 "/>
-<text text-anchor="middle" x="109" y="-560.3" font-family="Times,serif" font-size="14.00">pass</text>
-<polyline fill="none" stroke="black" points="129,-552.5 129,-575.5 "/>
-<text text-anchor="middle" x="154" y="-560.3" font-family="Times,serif" font-size="14.00">restart</text>
-<polyline fill="none" stroke="black" points="179,-552.5 179,-575.5 "/>
-<text text-anchor="middle" x="202" y="-560.3" font-family="Times,serif" font-size="14.00">synth</text>
-<polyline fill="none" stroke="black" points="225,-552.5 225,-575.5 "/>
-<text text-anchor="middle" x="246" y="-560.3" font-family="Times,serif" font-size="14.00">miss</text>
+<g id="node18" class="node">
+<title>lookup2</title>
+<polygon fill="none" stroke="#000000" points="0,-582.5 0,-670.5 226.9521,-670.5 226.9521,-582.5 0,-582.5"/>
+<text text-anchor="middle" x="113.4761" y="-655.3" font-family="Times,serif" font-size="14.00" fill="#000000">cnt_lookup:</text>
+<polyline fill="none" stroke="#000000" points="0,-648.5 226.9521,-648.5 "/>
+<text text-anchor="middle" x="62.6611" y="-622.3" font-family="Times,serif" font-size="14.00" fill="#000000">vcl_hit{}</text>
+<polyline fill="none" stroke="#000000" points="125.3223,-604.5 125.3223,-648.5 "/>
+<text text-anchor="middle" x="176.0171" y="-633.3" font-family="Times,serif" font-size="14.00" fill="#000000">req.*</text>
+<polyline fill="none" stroke="#000000" points="125.3223,-626.5 226.7119,-626.5 "/>
+<text text-anchor="middle" x="176.0171" y="-611.3" font-family="Times,serif" font-size="14.00" fill="#000000">obj.*</text>
+<polyline fill="none" stroke="#000000" points="0,-604.5 226.9521,-604.5 "/>
+<text text-anchor="middle" x="17.3276" y="-589.3" font-family="Times,serif" font-size="14.00" fill="#000000">fail</text>
+<polyline fill="none" stroke="#000000" points="34.6553,-582.5 34.6553,-604.5 "/>
+<text text-anchor="middle" x="62.0898" y="-589.3" font-family="Times,serif" font-size="14.00" fill="#000000">deliver</text>
+<polyline fill="none" stroke="#000000" points="89.5244,-582.5 89.5244,-604.5 "/>
+<text text-anchor="middle" x="109.5796" y="-589.3" font-family="Times,serif" font-size="14.00" fill="#000000">pass</text>
+<polyline fill="none" stroke="#000000" points="129.6348,-582.5 129.6348,-604.5 "/>
+<text text-anchor="middle" x="155.1245" y="-589.3" font-family="Times,serif" font-size="14.00" fill="#000000">restart</text>
+<polyline fill="none" stroke="#000000" points="180.6143,-582.5 180.6143,-604.5 "/>
+<text text-anchor="middle" x="203.7832" y="-589.3" font-family="Times,serif" font-size="14.00" fill="#000000">synth</text>
 </g>
 <!-- lookup2&#45;&gt;deliver -->
-<g id="edge23" class="edge"><title>lookup2:deliver:s&#45;&gt;deliver:n</title>
-<path fill="none" stroke="green" stroke-width="2" d="M61.5,-552C61.5,-509.813 124.5,-523.187 124.5,-481 124.5,-481 124.5,-481 124.5,-316 124.5,-272.769 297.87,-303.207 324.959,-271.486"/>
-<polygon fill="green" stroke="green" stroke-width="2" points="328.282,-272.593 328.5,-262 321.724,-270.145 328.282,-272.593"/>
+<g id="edge23" class="edge">
+<title>lookup2:s&#45;&gt;deliver:n</title>
+<path fill="none" stroke="#00ff00" stroke-width="2" d="M62.4761,-582.5C62.4761,-545.8367 104.4761,-548.1633 104.4761,-511.5 104.4761,-511.5 104.4761,-511.5 104.4761,-312 104.4761,-228.623 276.6669,-333.7963 291.4646,-266.6228"/>
+<polygon fill="#00ff00" stroke="#00ff00" stroke-width="2" points="294.9644,-266.7985 292.4761,-256.5 287.9991,-266.1024 294.9644,-266.7985"/>
 </g>
 <!-- lookup2&#45;&gt;BGFETCH -->
-<g id="edge12" class="edge"><title>lookup2:deliver:s&#45;&gt;BGFETCH</title>
-<path fill="none" stroke="green" d="M61.5,-552C61.5,-516.855 108.713,-552.652 138.5,-534 185.353,-504.661 221.839,-449.707 240.584,-417.132"/>
-<polygon fill="green" stroke="green" points="243.764,-418.619 245.61,-408.186 237.661,-415.19 243.764,-418.619"/>
-<text text-anchor="middle" x="260.5" y="-483.8" font-family="Times,serif" font-size="14.00">parallel</text>
-<text text-anchor="middle" x="260.5" y="-468.8" font-family="Times,serif" font-size="14.00">if obj expired</text>
+<g id="edge12" class="edge">
+<title>lookup2:s&#45;&gt;BGFETCH</title>
+<path fill="none" stroke="#00ff00" d="M62.4761,-582.5C62.4761,-556.2881 97.5468,-579.7806 118.4761,-564 158.3344,-533.947 187.3246,-482.3397 202.4781,-450.5924"/>
+<polygon fill="#00ff00" stroke="#00ff00" points="205.6985,-451.9674 206.7334,-441.4232 199.349,-449.0206 205.6985,-451.9674"/>
+<text text-anchor="middle" x="225.1865" y="-514.3" font-family="Times,serif" font-size="14.00" fill="#000000">parallel</text>
+<text text-anchor="middle" x="225.1865" y="-500.3" font-family="Times,serif" font-size="14.00" fill="#000000">if obj expired</text>
 </g>
 <!-- pass -->
-<g id="node21" class="node"><title>pass</title>
-<polygon fill="none" stroke="black" points="393,-445.5 393,-514.5 568,-514.5 568,-445.5 393,-445.5"/>
-<text text-anchor="middle" x="480.5" y="-499.3" font-family="Times,serif" font-size="14.00">cnt_pass:</text>
-<polyline fill="none" stroke="black" points="393,-491.5 568,-491.5 "/>
-<text text-anchor="middle" x="445" y="-476.3" font-family="Times,serif" font-size="14.00">vcl_pass{}</text>
-<polyline fill="none" stroke="black" points="497,-468.5 497,-491.5 "/>
-<text text-anchor="middle" x="532.5" y="-476.3" font-family="Times,serif" font-size="14.00">req.*</text>
-<polyline fill="none" stroke="black" points="393,-468.5 568,-468.5 "/>
-<text text-anchor="middle" x="410.5" y="-453.3" font-family="Times,serif" font-size="14.00">fail</text>
-<polyline fill="none" stroke="black" points="428,-445.5 428,-468.5 "/>
-<text text-anchor="middle" x="450" y="-453.3" font-family="Times,serif" font-size="14.00">fetch</text>
-<polyline fill="none" stroke="black" points="472,-445.5 472,-468.5 "/>
-<text text-anchor="middle" x="495" y="-453.3" font-family="Times,serif" font-size="14.00">synth</text>
-<polyline fill="none" stroke="black" points="518,-445.5 518,-468.5 "/>
-<text text-anchor="middle" x="543" y="-453.3" font-family="Times,serif" font-size="14.00">restart</text>
+<g id="node21" class="node">
+<title>pass</title>
+<polygon fill="none" stroke="#000000" points="353.5,-478.5 353.5,-544.5 529.4521,-544.5 529.4521,-478.5 353.5,-478.5"/>
+<text text-anchor="middle" x="441.4761" y="-529.3" font-family="Times,serif" font-size="14.00" fill="#000000">cnt_pass:</text>
+<polyline fill="none" stroke="#000000" points="353.5,-522.5 529.4521,-522.5 "/>
+<text text-anchor="middle" x="405.3267" y="-507.3" font-family="Times,serif" font-size="14.00" fill="#000000">vcl_pass{}</text>
+<polyline fill="none" stroke="#000000" points="457.1533,-500.5 457.1533,-522.5 "/>
+<text text-anchor="middle" x="492.8413" y="-507.3" font-family="Times,serif" font-size="14.00" fill="#000000">req.*</text>
+<polyline fill="none" stroke="#000000" points="353.5,-500.5 529.4521,-500.5 "/>
+<text text-anchor="middle" x="370.8276" y="-485.3" font-family="Times,serif" font-size="14.00" fill="#000000">fail</text>
+<polyline fill="none" stroke="#000000" points="388.1553,-478.5 388.1553,-500.5 "/>
+<text text-anchor="middle" x="410.145" y="-485.3" font-family="Times,serif" font-size="14.00" fill="#000000">fetch</text>
+<polyline fill="none" stroke="#000000" points="432.1348,-478.5 432.1348,-500.5 "/>
+<text text-anchor="middle" x="455.3037" y="-485.3" font-family="Times,serif" font-size="14.00" fill="#000000">synth</text>
+<polyline fill="none" stroke="#000000" points="478.4727,-478.5 478.4727,-500.5 "/>
+<text text-anchor="middle" x="503.9624" y="-485.3" font-family="Times,serif" font-size="14.00" fill="#000000">restart</text>
 </g>
 <!-- lookup2&#45;&gt;pass -->
-<g id="edge24" class="edge"><title>lookup2:pass:s&#45;&gt;pass</title>
-<path fill="none" stroke="red" stroke-width="2" d="M108.5,-552C108.5,-527.011 194.917,-538.487 219.5,-534 273.65,-524.115 333.88,-511.963 382.824,-501.789"/>
-<polygon fill="red" stroke="red" stroke-width="2" points="383.698,-505.182 392.774,-499.716 382.27,-498.329 383.698,-505.182"/>
+<g id="edge24" class="edge">
+<title>lookup2:s&#45;&gt;pass</title>
+<path fill="none" stroke="#ff0000" stroke-width="2" d="M109.4761,-582.5C109.4761,-580.9908 245.5165,-552.3208 343.4315,-531.881"/>
+<polygon fill="#ff0000" stroke="#ff0000" stroke-width="2" points="344.3036,-535.2745 353.3778,-529.8056 342.8737,-528.4221 344.3036,-535.2745"/>
 </g>
 <!-- lookup -->
-<g id="node19" class="node"><title>lookup</title>
-<polygon fill="none" stroke="grey" points="154,-734.5 154,-803.5 459,-803.5 459,-734.5 154,-734.5"/>
-<text text-anchor="middle" x="306.5" y="-788.3" font-family="Times,serif" font-size="14.00" fill="grey">cnt_lookup:</text>
-<polyline fill="none" stroke="grey" points="154,-780.5 459,-780.5 "/>
-<text text-anchor="middle" x="306.5" y="-765.3" font-family="Times,serif" font-size="14.00" fill="grey">hash lookup</text>
-<polyline fill="none" stroke="grey" points="154,-757.5 459,-757.5 "/>
-<text text-anchor="middle" x="172.5" y="-742.3" font-family="Times,serif" font-size="14.00" fill="grey">hit?</text>
-<polyline fill="none" stroke="grey" points="191,-734.5 191,-757.5 "/>
-<text text-anchor="middle" x="215" y="-742.3" font-family="Times,serif" font-size="14.00" fill="grey">miss?</text>
-<polyline fill="none" stroke="grey" points="239,-734.5 239,-757.5 "/>
-<text text-anchor="middle" x="282.5" y="-742.3" font-family="Times,serif" font-size="14.00" fill="grey">hit&#45;for&#45;miss?</text>
-<polyline fill="none" stroke="grey" points="326,-734.5 326,-757.5 "/>
-<text text-anchor="middle" x="368.5" y="-742.3" font-family="Times,serif" font-size="14.00" fill="grey">hit&#45;for&#45;pass?</text>
-<polyline fill="none" stroke="grey" points="411,-734.5 411,-757.5 "/>
-<text text-anchor="middle" x="435" y="-742.3" font-family="Times,serif" font-size="14.00" fill="grey">busy?</text>
+<g id="node19" class="node">
+<title>lookup</title>
+<polygon fill="none" stroke="#c0c0c0" points="143.4424,-757.5 143.4424,-823.5 451.5098,-823.5 451.5098,-757.5 143.4424,-757.5"/>
+<text text-anchor="middle" x="297.4761" y="-808.3" font-family="Times,serif" font-size="14.00" fill="#c0c0c0">cnt_lookup:</text>
+<polyline fill="none" stroke="#c0c0c0" points="143.4424,-801.5 451.5098,-801.5 "/>
+<text text-anchor="middle" x="297.4761" y="-786.3" font-family="Times,serif" font-size="14.00" fill="#c0c0c0">hash lookup</text>
+<polyline fill="none" stroke="#c0c0c0" points="143.4424,-779.5 451.5098,-779.5 "/>
+<text text-anchor="middle" x="161.939" y="-764.3" font-family="Times,serif" font-size="14.00" fill="#c0c0c0">hit?</text>
+<polyline fill="none" stroke="#c0c0c0" points="180.4355,-757.5 180.4355,-779.5 "/>
+<text text-anchor="middle" x="204.3804" y="-764.3" font-family="Times,serif" font-size="14.00" fill="#c0c0c0">miss?</text>
+<polyline fill="none" stroke="#c0c0c0" points="228.3252,-757.5 228.3252,-779.5 "/>
+<text text-anchor="middle" x="272.3472" y="-764.3" font-family="Times,serif" font-size="14.00" fill="#c0c0c0">hit&#45;for&#45;miss?</text>
+<polyline fill="none" stroke="#c0c0c0" points="316.3691,-757.5 316.3691,-779.5 "/>
+<text text-anchor="middle" x="359.6084" y="-764.3" font-family="Times,serif" font-size="14.00" fill="#c0c0c0">hit&#45;for&#45;pass?</text>
+<polyline fill="none" stroke="#c0c0c0" points="402.8477,-757.5 402.8477,-779.5 "/>
+<text text-anchor="middle" x="427.1787" y="-764.3" font-family="Times,serif" font-size="14.00" fill="#c0c0c0">busy?</text>
 </g>
 <!-- lookup&#45;&gt;lookup2 -->
-<g id="edge22" class="edge"><title>lookup:h:s&#45;&gt;lookup2</title>
-<path fill="none" stroke="green" stroke-width="2" d="M172.5,-733C172.5,-706.366 165.26,-677.9 157.018,-654.125"/>
-<polygon fill="green" stroke="green" stroke-width="2" points="160.26,-652.798 153.571,-644.582 153.677,-655.176 160.26,-652.798"/>
+<g id="edge22" class="edge">
+<title>lookup:s&#45;&gt;lookup2</title>
+<path fill="none" stroke="#00ff00" stroke-width="2" d="M161.4761,-757.5C161.4761,-730.8892 152.6358,-702.9921 142.5429,-679.8136"/>
+<polygon fill="#00ff00" stroke="#00ff00" stroke-width="2" points="145.6425,-678.1744 138.3197,-670.5176 139.2694,-681.0698 145.6425,-678.1744"/>
 </g>
 <!-- lookup&#45;&gt;lookup -->
-<g id="edge18" class="edge"><title>lookup:busy:s&#45;&gt;lookup:top:ne</title>
-<path fill="none" stroke="grey" d="M435.5,-734C465,-715 477,-715 477,-769 477,-811.188 469.676,-820.416 463.849,-813.375"/>
-<polygon fill="grey" stroke="grey" points="466.883,-811.599 459.5,-804 460.533,-814.544 466.883,-811.599"/>
-<text text-anchor="middle" x="507.5" y="-765.3" font-family="Times,serif" font-size="14.00" fill="grey"> waitinglist</text>
+<g id="edge18" class="edge">
+<title>lookup:s&#45;&gt;lookup:ne</title>
+<path fill="none" stroke="#c0c0c0" d="M427.4761,-757.5C457.5098,-739 469.5098,-739 469.5098,-790.5 469.5098,-830.7344 462.1855,-839.5356 456.1041,-832.6394"/>
+<polygon fill="#c0c0c0" stroke="#c0c0c0" points="459.1162,-830.8402 451.4761,-823.5 452.8713,-834.0026 459.1162,-830.8402"/>
+<text text-anchor="middle" x="500.8149" y="-786.3" font-family="Times,serif" font-size="14.00" fill="#c0c0c0"> waitinglist</text>
 </g>
 <!-- miss -->
-<g id="node20" class="node"><title>miss</title>
-<polygon fill="none" stroke="black" points="285,-564 285,-633 500,-633 500,-564 285,-564"/>
-<text text-anchor="middle" x="392.5" y="-617.8" font-family="Times,serif" font-size="14.00">cnt_miss:</text>
-<polyline fill="none" stroke="black" points="285,-610 500,-610 "/>
-<text text-anchor="middle" x="347.5" y="-594.8" font-family="Times,serif" font-size="14.00">vcl_miss{}</text>
-<polyline fill="none" stroke="black" points="410,-587 410,-610 "/>
-<text text-anchor="middle" x="455" y="-594.8" font-family="Times,serif" font-size="14.00">req.*</text>
-<polyline fill="none" stroke="black" points="285,-587 500,-587 "/>
-<text text-anchor="middle" x="302.5" y="-571.8" font-family="Times,serif" font-size="14.00">fail</text>
-<polyline fill="none" stroke="black" points="320,-564 320,-587 "/>
-<text text-anchor="middle" x="342" y="-571.8" font-family="Times,serif" font-size="14.00">fetch</text>
-<polyline fill="none" stroke="black" points="364,-564 364,-587 "/>
-<text text-anchor="middle" x="387" y="-571.8" font-family="Times,serif" font-size="14.00">synth</text>
-<polyline fill="none" stroke="black" points="410,-564 410,-587 "/>
-<text text-anchor="middle" x="435" y="-571.8" font-family="Times,serif" font-size="14.00">restart</text>
-<polyline fill="none" stroke="black" points="460,-564 460,-587 "/>
-<text text-anchor="middle" x="480" y="-571.8" font-family="Times,serif" font-size="14.00">pass</text>
+<g id="node20" class="node">
+<title>miss</title>
+<polygon fill="none" stroke="#000000" points="245.4448,-593.5 245.4448,-659.5 461.5073,-659.5 461.5073,-593.5 245.4448,-593.5"/>
+<text text-anchor="middle" x="353.4761" y="-644.3" font-family="Times,serif" font-size="14.00" fill="#000000">cnt_miss:</text>
+<polyline fill="none" stroke="#000000" points="245.4448,-637.5 461.5073,-637.5 "/>
+<text text-anchor="middle" x="308.0542" y="-622.3" font-family="Times,serif" font-size="14.00" fill="#000000">vcl_miss{}</text>
+<polyline fill="none" stroke="#000000" points="370.6636,-615.5 370.6636,-637.5 "/>
+<text text-anchor="middle" x="415.8516" y="-622.3" font-family="Times,serif" font-size="14.00" fill="#000000">req.*</text>
+<polyline fill="none" stroke="#000000" points="245.4448,-615.5 461.5073,-615.5 "/>
+<text text-anchor="middle" x="262.7725" y="-600.3" font-family="Times,serif" font-size="14.00" fill="#000000">fail</text>
+<polyline fill="none" stroke="#000000" points="280.1001,-593.5 280.1001,-615.5 "/>
+<text text-anchor="middle" x="302.0898" y="-600.3" font-family="Times,serif" font-size="14.00" fill="#000000">fetch</text>
+<polyline fill="none" stroke="#000000" points="324.0796,-593.5 324.0796,-615.5 "/>
+<text text-anchor="middle" x="347.2485" y="-600.3" font-family="Times,serif" font-size="14.00" fill="#000000">synth</text>
+<polyline fill="none" stroke="#000000" points="370.4175,-593.5 370.4175,-615.5 "/>
+<text text-anchor="middle" x="395.9072" y="-600.3" font-family="Times,serif" font-size="14.00" fill="#000000">restart</text>
+<polyline fill="none" stroke="#000000" points="421.397,-593.5 421.397,-615.5 "/>
+<text text-anchor="middle" x="441.4521" y="-600.3" font-family="Times,serif" font-size="14.00" fill="#000000">pass</text>
 </g>
 <!-- lookup&#45;&gt;miss -->
-<g id="edge19" class="edge"><title>lookup:miss:s&#45;&gt;miss</title>
-<path fill="none" stroke="blue" stroke-width="2" d="M214.5,-733C214.5,-705.26 270.529,-666.625 319.717,-638.052"/>
-<polygon fill="blue" stroke="blue" stroke-width="2" points="321.558,-641.031 328.489,-633.018 318.074,-634.959 321.558,-641.031"/>
+<g id="edge19" class="edge">
+<title>lookup:s&#45;&gt;miss</title>
+<path fill="none" stroke="#0000ff" stroke-width="2" d="M204.4761,-757.5C204.4761,-717.3321 235.3955,-686.5759 269.0645,-664.9919"/>
+<polygon fill="#0000ff" stroke="#0000ff" stroke-width="2" points="270.9818,-667.9218 277.6666,-659.702 267.3149,-661.9591 270.9818,-667.9218"/>
 </g>
 <!-- lookup&#45;&gt;miss -->
-<g id="edge20" class="edge"><title>lookup:hfm:s&#45;&gt;miss</title>
-<path fill="none" stroke="blue" stroke-width="2" d="M282.5,-733C282.5,-695.827 308.217,-663.39 334.782,-639.801"/>
-<polygon fill="blue" stroke="blue" stroke-width="2" points="337.321,-642.235 342.65,-633.078 332.773,-636.913 337.321,-642.235"/>
-<text text-anchor="middle" x="342.5" y="-681.8" font-family="Times,serif" font-size="14.00"> req.</text>
-<text text-anchor="middle" x="342.5" y="-666.8" font-family="Times,serif" font-size="14.00"> is_hitmiss</text>
+<g id="edge20" class="edge">
+<title>lookup:s&#45;&gt;miss</title>
+<path fill="none" stroke="#0000ff" stroke-width="2" d="M272.4761,-757.5C272.4761,-723.8667 292.0301,-691.6593 311.9231,-667.5959"/>
+<polygon fill="#0000ff" stroke="#0000ff" stroke-width="2" points="314.795,-669.6239 318.6547,-659.7572 309.4844,-665.0634 314.795,-669.6239"/>
+<text text-anchor="middle" x="323.6226" y="-705.8" font-family="Times,serif" font-size="14.00" fill="#000000"> req.</text>
+<text text-anchor="middle" x="323.6226" y="-691.8" font-family="Times,serif" font-size="14.00" fill="#000000"> is_hitmiss</text>
 </g>
 <!-- lookup&#45;&gt;pass -->
-<g id="edge21" class="edge"><title>lookup:hfp:s&#45;&gt;pass</title>
-<path fill="none" stroke="red" stroke-width="2" d="M368.5,-733C368.5,-659.507 472.955,-709.326 508.5,-645 529.186,-607.564 516.573,-558.565 502.262,-523.905"/>
-<polygon fill="red" stroke="red" stroke-width="2" points="505.39,-522.319 498.207,-514.531 498.965,-525.098 505.39,-522.319"/>
-<text text-anchor="middle" x="548.5" y="-602.3" font-family="Times,serif" font-size="14.00"> req.</text>
-<text text-anchor="middle" x="548.5" y="-587.3" font-family="Times,serif" font-size="14.00"> is_hitpass</text>
+<g id="edge21" class="edge">
+<title>lookup:s&#45;&gt;pass</title>
+<path fill="none" stroke="#ff0000" stroke-width="2" d="M359.4761,-757.5C359.4761,-694.956 443.0235,-727.1971 470.4761,-671 488.5224,-634.0581 476.5305,-587.3408 462.9055,-554.0331"/>
+<polygon fill="#ff0000" stroke="#ff0000" stroke-width="2" points="466.0104,-552.3929 458.8502,-544.5838 459.5777,-555.1536 466.0104,-552.3929"/>
+<text text-anchor="middle" x="508.8398" y="-629.3" font-family="Times,serif" font-size="14.00" fill="#000000"> req.</text>
+<text text-anchor="middle" x="508.8398" y="-615.3" font-family="Times,serif" font-size="14.00" fill="#000000"> is_hitpass</text>
 </g>
 <!-- miss&#45;&gt;FETCH -->
-<g id="edge25" class="edge"><title>miss:fetch:s&#45;&gt;FETCH</title>
-<path fill="none" stroke="blue" stroke-width="2" d="M341.5,-562.5C341.5,-511.453 341.5,-451.86 341.5,-418.063"/>
-<polygon fill="blue" stroke="blue" stroke-width="2" points="345,-418.039 341.5,-408.039 338,-418.039 345,-418.039"/>
+<g id="edge25" class="edge">
+<title>miss:s&#45;&gt;FETCH</title>
+<path fill="none" stroke="#0000ff" stroke-width="2" d="M302.4761,-593.5C302.4761,-543.4187 302.4761,-485.0629 302.4761,-451.2444"/>
+<polygon fill="#0000ff" stroke="#0000ff" stroke-width="2" points="305.9762,-451.1681 302.4761,-441.1681 298.9762,-451.1682 305.9762,-451.1681"/>
 </g>
 <!-- miss&#45;&gt;pass -->
-<g id="edge26" class="edge"><title>miss:pass:s&#45;&gt;pass</title>
-<path fill="none" stroke="red" stroke-width="2" d="M480.5,-562.5C480.5,-550.353 480.5,-537.187 480.5,-525.052"/>
-<polygon fill="red" stroke="red" stroke-width="2" points="484,-524.704 480.5,-514.704 477,-524.705 484,-524.704"/>
+<g id="edge26" class="edge">
+<title>miss:s&#45;&gt;pass</title>
+<path fill="none" stroke="#ff0000" stroke-width="2" d="M441.4761,-593.5C441.4761,-580.9322 441.4761,-567.2809 441.4761,-554.7879"/>
+<polygon fill="#ff0000" stroke="#ff0000" stroke-width="2" points="444.9762,-554.6155 441.4761,-544.6155 437.9762,-554.6155 444.9762,-554.6155"/>
 </g>
 <!-- pass&#45;&gt;FETCH -->
-<g id="edge27" class="edge"><title>pass:fetch:s&#45;&gt;FETCH</title>
-<path fill="none" stroke="red" stroke-width="2" d="M449.5,-445C449.5,-441.01 411.3,-422.667 380.338,-408.453"/>
-<polygon fill="red" stroke="red" stroke-width="2" points="381.562,-405.164 371.011,-404.195 378.655,-411.532 381.562,-405.164"/>
+<g id="edge27" class="edge">
+<title>pass:s&#45;&gt;FETCH</title>
+<path fill="none" stroke="#ff0000" stroke-width="2" d="M410.4761,-478.5C410.4761,-474.5239 372.9556,-455.9536 342.145,-441.3746"/>
+<polygon fill="#ff0000" stroke="#ff0000" stroke-width="2" points="343.386,-438.0904 332.8475,-436.9987 340.4051,-444.424 343.386,-438.0904"/>
 </g>
 <!-- pipe -->
-<g id="node22" class="node"><title>pipe</title>
-<polygon fill="none" stroke="black" points="751.5,-711.5 751.5,-826.5 885.5,-826.5 885.5,-711.5 751.5,-711.5"/>
-<text text-anchor="middle" x="818.5" y="-811.3" font-family="Times,serif" font-size="14.00">cnt_pipe:</text>
-<polyline fill="none" stroke="black" points="751.5,-803.5 885.5,-803.5 "/>
-<text text-anchor="middle" x="818.5" y="-788.3" font-family="Times,serif" font-size="14.00">filter req.*&#45;&gt;bereq.*</text>
-<polyline fill="none" stroke="black" points="751.5,-780.5 885.5,-780.5 "/>
-<text text-anchor="middle" x="790" y="-753.8" font-family="Times,serif" font-size="14.00">vcl_pipe{}</text>
-<polyline fill="none" stroke="black" points="828.5,-734.5 828.5,-780.5 "/>
-<text text-anchor="middle" x="857" y="-765.3" font-family="Times,serif" font-size="14.00">req.*</text>
-<polyline fill="none" stroke="black" points="828.5,-757.5 885.5,-757.5 "/>
-<text text-anchor="middle" x="857" y="-742.3" font-family="Times,serif" font-size="14.00">bereq.*</text>
-<polyline fill="none" stroke="black" points="751.5,-734.5 885.5,-734.5 "/>
-<text text-anchor="middle" x="771" y="-719.3" font-family="Times,serif" font-size="14.00">fail</text>
-<polyline fill="none" stroke="black" points="790.5,-711.5 790.5,-734.5 "/>
-<text text-anchor="middle" x="812.5" y="-719.3" font-family="Times,serif" font-size="14.00">pipe</text>
-<polyline fill="none" stroke="black" points="834.5,-711.5 834.5,-734.5 "/>
-<text text-anchor="middle" x="860" y="-719.3" font-family="Times,serif" font-size="14.00">synth</text>
+<g id="node22" class="node">
+<title>pipe</title>
+<polygon fill="none" stroke="#000000" points="754.8579,-735.5 754.8579,-845.5 890.0942,-845.5 890.0942,-735.5 754.8579,-735.5"/>
+<text text-anchor="middle" x="822.4761" y="-830.3" font-family="Times,serif" font-size="14.00" fill="#000000">cnt_pipe:</text>
+<polyline fill="none" stroke="#000000" points="754.8579,-823.5 890.0942,-823.5 "/>
+<text text-anchor="middle" x="822.4761" y="-808.3" font-family="Times,serif" font-size="14.00" fill="#000000">filter req.*&#45;&gt;bereq.*</text>
+<polyline fill="none" stroke="#000000" points="754.8579,-801.5 890.0942,-801.5 "/>
+<text text-anchor="middle" x="793.6812" y="-775.3" font-family="Times,serif" font-size="14.00" fill="#000000">vcl_pipe{}</text>
+<polyline fill="none" stroke="#000000" points="832.5044,-757.5 832.5044,-801.5 "/>
+<text text-anchor="middle" x="861.2993" y="-786.3" font-family="Times,serif" font-size="14.00" fill="#000000">req.*</text>
+<polyline fill="none" stroke="#000000" points="832.5044,-779.5 890.0942,-779.5 "/>
+<text text-anchor="middle" x="861.2993" y="-764.3" font-family="Times,serif" font-size="14.00" fill="#000000">bereq.*</text>
+<polyline fill="none" stroke="#000000" points="754.8579,-757.5 890.0942,-757.5 "/>
+<text text-anchor="middle" x="774.1855" y="-742.3" font-family="Times,serif" font-size="14.00" fill="#000000">fail</text>
+<polyline fill="none" stroke="#000000" points="793.5132,-735.5 793.5132,-757.5 "/>
+<text text-anchor="middle" x="816.0649" y="-742.3" font-family="Times,serif" font-size="14.00" fill="#000000">pipe</text>
+<polyline fill="none" stroke="#000000" points="838.6167,-735.5 838.6167,-757.5 "/>
+<text text-anchor="middle" x="864.2856" y="-742.3" font-family="Times,serif" font-size="14.00" fill="#000000">synth</text>
 </g>
 <!-- pipe_do -->
-<g id="node23" class="node"><title>pipe_do</title>
-<ellipse fill="none" stroke="black" cx="838.5" cy="-598.5" rx="95.4188" ry="26.7407"/>
-<text text-anchor="middle" x="838.5" y="-602.3" font-family="Times,serif" font-size="14.00">send bereq,</text>
-<text text-anchor="middle" x="838.5" y="-587.3" font-family="Times,serif" font-size="14.00">copy bytes until close</text>
+<g id="node23" class="node">
+<title>pipe_do</title>
+<ellipse fill="none" stroke="#000000" cx="834.4761" cy="-626.5" rx="97.2377" ry="25.4118"/>
+<text text-anchor="middle" x="834.4761" y="-629.3" font-family="Times,serif" font-size="14.00" fill="#000000">send bereq,</text>
+<text text-anchor="middle" x="834.4761" y="-615.3" font-family="Times,serif" font-size="14.00" fill="#000000">copy bytes until close</text>
 </g>
 <!-- pipe&#45;&gt;pipe_do -->
-<g id="edge28" class="edge"><title>pipe:pipe&#45;&gt;pipe_do</title>
-<path fill="none" stroke="orange" stroke-width="2" d="M812.5,-711C812.5,-685.089 819.241,-656.656 825.859,-634.987"/>
-<polygon fill="orange" stroke="orange" stroke-width="2" points="829.264,-635.828 828.966,-625.238 822.595,-633.703 829.264,-635.828"/>
+<g id="edge28" class="edge">
+<title>pipe:pipe&#45;&gt;pipe_do</title>
+<path fill="none" stroke="#ffa500" stroke-width="2" d="M816.4761,-735.5C816.4761,-710.7759 821.04,-683.3137 825.5717,-662.1398"/>
+<polygon fill="#ffa500" stroke="#ffa500" stroke-width="2" points="829.0075,-662.8127 827.7735,-652.29 822.1761,-661.2855 829.0075,-662.8127"/>
 </g>
 <!-- pipe_do&#45;&gt;DONE -->
-<g id="edge29" class="edge"><title>pipe_do&#45;&gt;DONE</title>
-<path fill="none" stroke="orange" stroke-width="2" d="M806.365,-573.008C782.295,-551.65 753.5,-518.305 753.5,-481 753.5,-481 753.5,-481 753.5,-90 753.5,-61.4654 725.42,-42.7891 700.286,-31.7876"/>
-<polygon fill="orange" stroke="orange" stroke-width="2" points="701.444,-28.4797 690.862,-27.9423 698.799,-34.961 701.444,-28.4797"/>
+<g id="edge29" class="edge">
+<title>pipe_do&#45;&gt;DONE</title>
+<path fill="none" stroke="#ffa500" stroke-width="2" d="M816.4249,-601.3665C802.103,-578.9288 784.4761,-544.5915 784.4761,-511.5 784.4761,-511.5 784.4761,-511.5 784.4761,-91 784.4761,-61.4581 700.1619,-38.1594 646.9439,-26.396"/>
+<polygon fill="#ffa500" stroke="#ffa500" stroke-width="2" points="647.5859,-22.954 637.0727,-24.2667 646.1099,-29.7967 647.5859,-22.954"/>
 </g>
 <!-- restart&#45;&gt;recv -->
-<g id="edge31" class="edge"><title>restart:ok:s&#45;&gt;recv</title>
-<path fill="none" stroke="black" d="M890.5,-1078C890.5,-1064.91 875.442,-1053.71 853.468,-1044.33"/>
-<polygon fill="black" stroke="black" points="854.598,-1041.01 844.013,-1040.56 852.004,-1047.51 854.598,-1041.01"/>
+<g id="edge31" class="edge">
+<title>restart:s&#45;&gt;recv</title>
+<path fill="none" stroke="#000000" d="M889.4761,-1091.5C889.4761,-1078.1582 873.776,-1066.7633 851.0656,-1057.2594"/>
+<polygon fill="#000000" stroke="#000000" points="852.2589,-1053.9679 841.6714,-1053.5746 849.7028,-1060.4845 852.2589,-1053.9679"/>
 </g>
 <!-- err_restart -->
-<g id="node25" class="node"><title>err_restart</title>
-<text text-anchor="middle" x="955.5" y="-1002.3" font-family="Times,serif" font-size="14.00">SYNTH</text>
+<g id="node25" class="node">
+<title>err_restart</title>
+<text text-anchor="middle" x="954.4761" y="-1016.3" font-family="Times,serif" font-size="14.00" fill="#000000">SYNTH</text>
 </g>
 <!-- restart&#45;&gt;err_restart -->
-<g id="edge32" class="edge"><title>restart:max:s&#45;&gt;err_restart</title>
-<path fill="none" stroke="purple" d="M955.5,-1078C955.5,-1063.65 955.5,-1047.67 955.5,-1034.51"/>
-<polygon fill="purple" stroke="purple" points="959,-1034.22 955.5,-1024.22 952,-1034.22 959,-1034.22"/>
+<g id="edge32" class="edge">
+<title>restart:s&#45;&gt;err_restart</title>
+<path fill="none" stroke="#a020f0" d="M954.4761,-1091.5C954.4761,-1077.4402 954.4761,-1061.8143 954.4761,-1048.8091"/>
+<polygon fill="#a020f0" stroke="#a020f0" points="957.9762,-1048.5929 954.4761,-1038.5929 950.9762,-1048.5929 957.9762,-1048.5929"/>
 </g>
 <!-- hash&#45;&gt;lookup -->
-<g id="edge36" class="edge"><title>hash:lookup:w&#45;&gt;lookup</title>
-<path fill="none" stroke="green" stroke-width="2" d="M577.5,-876C501.089,-876 420.371,-838.999 367.108,-808.718"/>
-<polygon fill="green" stroke="green" stroke-width="2" points="368.555,-805.512 358.145,-803.539 365.052,-811.573 368.555,-805.512"/>
+<g id="edge36" class="edge">
+<title>hash:w&#45;&gt;lookup</title>
+<path fill="none" stroke="#00ff00" stroke-width="2" d="M577.4761,-894.5C499.0047,-894.5 415.4676,-858.1605 360.273,-828.4433"/>
+<polygon fill="#00ff00" stroke="#00ff00" stroke-width="2" points="361.7772,-825.2767 351.3242,-823.5491 358.4184,-831.4183 361.7772,-825.2767"/>
 </g>
 <!-- hash&#45;&gt;pass -->
-<g id="edge38" class="edge"><title>hash:lookup:s&#45;&gt;pass</title>
-<path fill="none" stroke="red" stroke-width="2" d="M639.5,-864C639.5,-834.169 681.37,-853.272 695.5,-827 719.921,-781.595 711.277,-760.082 695.5,-711 668.89,-628.218 643.271,-613.198 581.5,-552 570.089,-540.694 556.702,-529.923 543.476,-520.342"/>
-<polygon fill="red" stroke="red" stroke-width="2" points="545.463,-517.461 535.28,-514.537 541.417,-523.173 545.463,-517.461"/>
+<g id="edge38" class="edge">
+<title>hash:s&#45;&gt;pass</title>
+<path fill="none" stroke="#ff0000" stroke-width="2" d="M639.4761,-883.5C639.4761,-855.3654 677.7748,-871.1044 690.4761,-846 712.7475,-801.98 708.976,-780.7333 690.4761,-735 656.8931,-651.9802 573.4546,-587.8964 512.3878,-550.0499"/>
+<polygon fill="#ff0000" stroke="#ff0000" stroke-width="2" points="513.9085,-546.8777 503.5489,-544.6573 510.2627,-552.8534 513.9085,-546.8777"/>
 </g>
 <!-- hash&#45;&gt;pipe -->
-<g id="edge39" class="edge"><title>hash:lookup:e&#45;&gt;pipe</title>
-<path fill="none" stroke="orange" stroke-width="2" d="M701.5,-876C731.412,-876 757.084,-856.736 776.695,-834.633"/>
-<polygon fill="orange" stroke="orange" stroke-width="2" points="779.597,-836.622 783.375,-826.724 774.249,-832.105 779.597,-836.622"/>
+<g id="edge39" class="edge">
+<title>hash:e&#45;&gt;pipe</title>
+<path fill="none" stroke="#ffa500" stroke-width="2" d="M700.4761,-894.5C731.2326,-894.5 758.1692,-875.1206 778.8526,-853.0929"/>
+<polygon fill="#ffa500" stroke="#ffa500" stroke-width="2" points="781.5511,-855.3262 785.6237,-845.5453 776.3406,-850.6517 781.5511,-855.3262"/>
 </g>
 <!-- purge -->
-<g id="node27" class="node"><title>purge</title>
-<polygon fill="none" stroke="black" points="556,-734.5 556,-803.5 687,-803.5 687,-734.5 556,-734.5"/>
-<text text-anchor="middle" x="621.5" y="-788.3" font-family="Times,serif" font-size="14.00">cnt_purge:</text>
-<polyline fill="none" stroke="black" points="556,-780.5 687,-780.5 "/>
-<text text-anchor="middle" x="598.5" y="-765.3" font-family="Times,serif" font-size="14.00">vcl_purge{}</text>
-<polyline fill="none" stroke="black" points="641,-757.5 641,-780.5 "/>
-<text text-anchor="middle" x="664" y="-765.3" font-family="Times,serif" font-size="14.00">req.*</text>
-<polyline fill="none" stroke="black" points="556,-757.5 687,-757.5 "/>
-<text text-anchor="middle" x="573.5" y="-742.3" font-family="Times,serif" font-size="14.00">fail</text>
-<polyline fill="none" stroke="black" points="591,-734.5 591,-757.5 "/>
-<text text-anchor="middle" x="614" y="-742.3" font-family="Times,serif" font-size="14.00">synth</text>
-<polyline fill="none" stroke="black" points="637,-734.5 637,-757.5 "/>
-<text text-anchor="middle" x="662" y="-742.3" font-family="Times,serif" font-size="14.00">restart</text>
+<g id="node27" class="node">
+<title>purge</title>
+<polygon fill="none" stroke="#000000" points="549.4897,-757.5 549.4897,-823.5 681.4624,-823.5 681.4624,-757.5 549.4897,-757.5"/>
+<text text-anchor="middle" x="615.4761" y="-808.3" font-family="Times,serif" font-size="14.00" fill="#000000">cnt_purge:</text>
+<polyline fill="none" stroke="#000000" points="549.4897,-801.5 681.4624,-801.5 "/>
+<text text-anchor="middle" x="592.5762" y="-786.3" font-family="Times,serif" font-size="14.00" fill="#000000">vcl_purge{}</text>
+<polyline fill="none" stroke="#000000" points="635.6626,-779.5 635.6626,-801.5 "/>
+<text text-anchor="middle" x="658.3506" y="-786.3" font-family="Times,serif" font-size="14.00" fill="#000000">req.*</text>
+<polyline fill="none" stroke="#000000" points="549.4897,-779.5 681.4624,-779.5 "/>
+<text text-anchor="middle" x="566.8174" y="-764.3" font-family="Times,serif" font-size="14.00" fill="#000000">fail</text>
+<polyline fill="none" stroke="#000000" points="584.145,-757.5 584.145,-779.5 "/>
+<text text-anchor="middle" x="607.314" y="-764.3" font-family="Times,serif" font-size="14.00" fill="#000000">synth</text>
+<polyline fill="none" stroke="#000000" points="630.4829,-757.5 630.4829,-779.5 "/>
+<text text-anchor="middle" x="655.9727" y="-764.3" font-family="Times,serif" font-size="14.00" fill="#000000">restart</text>
 </g>
 <!-- hash&#45;&gt;purge -->
-<g id="edge37" class="edge"><title>hash:lookup:s&#45;&gt;purge:top:n</title>
-<path fill="none" stroke="purple" stroke-width="2" d="M639.5,-864C639.5,-840.333 626.085,-833.99 622.417,-815.06"/>
-<polygon fill="purple" stroke="purple" stroke-width="2" points="625.894,-814.641 621.5,-805 618.923,-815.277 625.894,-814.641"/>
+<g id="edge37" class="edge">
+<title>hash:s&#45;&gt;purge:n</title>
+<path fill="none" stroke="#a020f0" stroke-width="2" d="M639.4761,-883.5C639.4761,-858.5936 621.4277,-853.3619 616.6336,-833.6816"/>
+<polygon fill="#a020f0" stroke="#a020f0" stroke-width="2" points="620.0834,-833.0406 615.4761,-823.5 613.1282,-833.8314 620.0834,-833.0406"/>
 </g>
 </g>
 </svg>
diff --git a/doc/sphinx/users-guide/vcl-built-in-subs.rst b/doc/sphinx/users-guide/vcl-built-in-subs.rst
index 8d99efd59..94f62c9da 100644
--- a/doc/sphinx/users-guide/vcl-built-in-subs.rst
+++ b/doc/sphinx/users-guide/vcl-built-in-subs.rst
@@ -267,10 +267,6 @@ with one of the following keywords:
   ``pass``
     see  `pass`_
 
-  ``miss``
-    Synchronously refresh the object from the backend despite the
-    cache hit. Control will eventually pass to :ref:`vcl_miss`.
-
   ``deliver``
     Deliver the object. If it is stale, a background fetch to refresh
     it is triggered.

From guillaume at varnish-software.com  Tue Aug  6 16:55:08 2019
From: guillaume at varnish-software.com (Guillaume Quintard)
Date: Tue,  6 Aug 2019 16:55:08 +0000 (UTC)
Subject: [master] d760826b4 Include headers to compile on musl
Message-ID: <20190806165508.35EA1A89FB@lists.varnish-cache.org>


commit d760826b43b7e35975437c7c6d069450d8caf511
Author: Guillaume Quintard <guillaume at varnish-software.com>
Date:   Tue Aug 6 09:53:14 2019 -0700

    Include headers to compile on musl

diff --git a/lib/libvarnish/vte.c b/lib/libvarnish/vte.c
index f71a147b8..fa6be82be 100644
--- a/lib/libvarnish/vte.c
+++ b/lib/libvarnish/vte.c
@@ -31,6 +31,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <sys/types.h> /* for MUSL (ssize_t) */
 
 #include "vdef.h"
 #include "vqueue.h"

From phk at FreeBSD.org  Wed Aug  7 08:23:11 2019
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Wed,  7 Aug 2019 08:23:11 +0000 (UTC)
Subject: [master] 6125e1426 Remove the detour over a C-enum for the shard "by"
 argument.
Message-ID: <20190807082311.319E363889@lists.varnish-cache.org>


commit 6125e14266babadb6668524c7cab78ba73b6967d
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Aug 7 07:57:17 2019 +0000

    Remove the detour over a C-enum for the shard "by" argument.
    
    Also collect in one single place that HASH is the default.

diff --git a/bin/varnishtest/tests/d00030.vtc b/bin/varnishtest/tests/d00030.vtc
index 497b3c7cf..3c29f33e7 100644
--- a/bin/varnishtest/tests/d00030.vtc
+++ b/bin/varnishtest/tests/d00030.vtc
@@ -111,7 +111,7 @@ varnish v1 -errvcl {key and key_blob arguments are invalid with by=URL} {
     }
 }
 
-varnish v1 -errvcl {key and key_blob arguments are invalid with by=HASH (default)} {
+varnish v1 -errvcl {key and key_blob arguments are invalid with by=HASH} {
     import directors;
     import blob;
 
diff --git a/lib/libvmod_directors/shard_dir.h b/lib/libvmod_directors/shard_dir.h
index 021fa1257..56d2e6633 100644
--- a/lib/libvmod_directors/shard_dir.h
+++ b/lib/libvmod_directors/shard_dir.h
@@ -27,13 +27,6 @@
  * SUCH DAMAGE.
  */
 
-enum by_e {
-	_BY_E_INVALID = 0,
-#define VMODENUM(x) BY_ ## x,
-#include "tbl_by.h"
-	_BY_E_MAX
-};
-
 enum healthy_e {
 	_HEALTHY_E_INVALID = 0,
 #define VMODENUM(x) x,
diff --git a/lib/libvmod_directors/vmod_shard.c b/lib/libvmod_directors/vmod_shard.c
index 3fd7fc605..a940ff346 100644
--- a/lib/libvmod_directors/vmod_shard.c
+++ b/lib/libvmod_directors/vmod_shard.c
@@ -127,7 +127,7 @@ struct vmod_directors_shard_param {
 	enum vmod_directors_shard_param_scope	scope;
 
 	/* parameters */
-	enum by_e				by;
+	VCL_ENUM				by;
 	enum healthy_e				healthy;
 	uint32_t				mask;
 	VCL_BOOL				rampup;
@@ -144,13 +144,14 @@ static const struct vmod_directors_shard_param shard_param_default = {
 	.scope		= SCOPE_VMOD,
 
 	.mask		= arg_mask_param_,
-	.by		= BY_HASH,
 	.healthy	= CHOSEN,
 	.rampup	= 1,
 	.alt		= 0,
 	.warmup		= -1,
 };
 
+#define default_by(ptr) (ptr == NULL ? VENUM(HASH) : ptr)
+
 static struct vmod_directors_shard_param *
 shard_param_stack(struct vmod_directors_shard_param *p,
     const struct vmod_directors_shard_param *pa, const char *who);
@@ -181,14 +182,6 @@ struct vmod_directors_shard {
 	VCL_BACKEND				dir;
 };
 
-static enum by_e
-parse_by_e(VCL_ENUM e)
-{
-#define VMODENUM(n) if (e == VENUM(n)) return(BY_ ## n);
-#include "tbl_by.h"
-       WRONG("illegal by enum");
-}
-
 static enum healthy_e
 parse_healthy_e(VCL_ENUM e)
 {
@@ -205,12 +198,6 @@ parse_resolve_e(VCL_ENUM e)
        WRONG("illegal resolve enum");
 }
 
-static const char * const by_str[_BY_E_MAX] = {
-	[_BY_E_INVALID] = "*INVALID*",
-#define VMODENUM(n) [BY_ ## n] = #n,
-#include "tbl_by.h"
-};
-
 static const char * const healthy_str[_HEALTHY_E_MAX] = {
 	[_HEALTHY_E_INVALID] = "*INVALID*",
 #define VMODENUM(n) [n] = #n,
@@ -393,15 +380,15 @@ shard_get_key(VRT_CTX, const struct vmod_directors_shard_param *p)
 	struct http *http;
 	struct strands s[1];
 	const char *sp[1];
+	VCL_ENUM by = default_by(p->by);
 
-	switch (p->by) {
-	case BY_HASH:
-		if (ctx->bo) {
-			CHECK_OBJ(ctx->bo, BUSYOBJ_MAGIC);
-			return (vbe32dec(ctx->bo->digest));
-		}
-		/* FALLTHROUGH */
-	case BY_URL:
+	if (by == VENUM(KEY) || by == VENUM(BLOB))
+		return (p->key);
+	if (by == VENUM(HASH) && ctx->bo != NULL) {
+		CHECK_OBJ(ctx->bo, BUSYOBJ_MAGIC);
+		return (vbe32dec(ctx->bo->digest));
+	}
+	if (by == VENUM(HASH) || by == VENUM(URL)) {
 		if (ctx->http_req) {
 			AN(http = ctx->http_req);
 		} else {
@@ -412,12 +399,8 @@ shard_get_key(VRT_CTX, const struct vmod_directors_shard_param *p)
 		s->n = 1;
 		s->p = sp;
 		return (sharddir_sha256(s));
-	case BY_KEY:
-	case BY_BLOB:
-		return (p->key);
-	default:
-		WRONG("by enum");
 	}
+	WRONG("by enum");
 }
 
 /*
@@ -439,7 +422,7 @@ shard_param_merge(struct vmod_directors_shard_param *to,
 
 	if ((to->mask & arg_by) == 0 && (from->mask & arg_by) != 0) {
 		to->by = from->by;
-		if (from->by == BY_KEY || from->by == BY_BLOB)
+		if (from->by == VENUM(KEY) || from->by == VENUM(BLOB))
 			to->key = from->key;
 	}
 
@@ -529,7 +512,6 @@ shard_param_args(VRT_CTX,
     uint32_t args, 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)
 {
-	enum by_e	by;
 	enum healthy_e	healthy;
 
 	CHECK_OBJ_NOTNULL(p, VMOD_SHARD_SHARD_PARAM_MAGIC);
@@ -537,73 +519,57 @@ shard_param_args(VRT_CTX,
 
 	assert((args & ~arg_mask_set_) == 0);
 
-	by = (args & arg_by) ? parse_by_e(by_s) : BY_HASH;
+	if (!(args & arg_by))
+		by_s = NULL;
+	by_s = default_by(by_s);
 	healthy = (args & arg_healthy) ? parse_healthy_e(healthy_s) : CHOSEN;
 
 	/* by_s / key_int / key_blob */
-	if (args & arg_by) {
-		switch (by) {
-		case BY_KEY:
-			if ((args & arg_key) == 0) {
-				VRT_fail(ctx, "%s %s: "
-					 "missing key argument with by=%s",
-					 who, p->vcl_name, by_s);
-				return (NULL);
-			}
-			if (key_int < 0 || key_int > UINT32_MAX) {
-				VRT_fail(ctx, "%s %s: "
-					 "invalid key argument %jd with by=%s",
-					 who, p->vcl_name,
-					 (intmax_t)key_int, by_s);
-				return (NULL);
-			}
-			assert(key_int >= 0);
-			assert(key_int <= UINT32_MAX);
-			p->key = (uint32_t)key_int;
-			break;
-		case BY_BLOB:
-			if ((args & arg_key_blob) == 0) {
-				VRT_fail(ctx, "%s %s: "
-					 "missing key_blob argument with by=%s",
-					 who, p->vcl_name, by_s);
-				return (NULL);
-			}
-			if (key_blob == NULL || key_blob->len == 0 ||
-			    key_blob->blob == NULL) {
-				sharddir_err(ctx, SLT_Error, "%s %s: "
-					     "by=BLOB but no or empty key_blob "
-					     "- using key 0",
-					     who, p->vcl_name);
-				p->key = 0;
-			} else
-				p->key = shard_blob_key(key_blob);
-			break;
-		case BY_HASH:
-		case BY_URL:
-			if (args & (arg_key|arg_key_blob)) {
-				VRT_fail(ctx, "%s %s: "
-					 "key and key_blob arguments are "
-					 "invalid with by=%s",
-					 who, p->vcl_name, by_s);
-				return (NULL);
-			}
-			break;
-		default:
-			WRONG("by enum");
+	if (by_s == VENUM(KEY)) {
+		if ((args & arg_key) == 0) {
+			VRT_fail(ctx, "%s %s: "
+				 "missing key argument with by=%s",
+				 who, p->vcl_name, by_s);
+			return (NULL);
 		}
-		p->by = by;
-	} else {
-		/* (args & arg_by) == 0 */
-		p->by = BY_HASH;
-
+		if (key_int < 0 || key_int > UINT32_MAX) {
+			VRT_fail(ctx, "%s %s: "
+				 "invalid key argument %jd with by=%s",
+				 who, p->vcl_name,
+				 (intmax_t)key_int, by_s);
+			return (NULL);
+		}
+		assert(key_int >= 0);
+		assert(key_int <= UINT32_MAX);
+		p->key = (uint32_t)key_int;
+	} else if (by_s == VENUM(BLOB)) {
+		if ((args & arg_key_blob) == 0) {
+			VRT_fail(ctx, "%s %s: "
+				 "missing key_blob argument with by=%s",
+				 who, p->vcl_name, by_s);
+			return (NULL);
+		}
+		if (key_blob == NULL || key_blob->len == 0 ||
+		    key_blob->blob == NULL) {
+			sharddir_err(ctx, SLT_Error, "%s %s: "
+				     "by=BLOB but no or empty key_blob "
+				     "- using key 0",
+				     who, p->vcl_name);
+			p->key = 0;
+		} else
+			p->key = shard_blob_key(key_blob);
+	} else if (by_s == VENUM(HASH) || by_s == VENUM(URL)) {
 		if (args & (arg_key|arg_key_blob)) {
 			VRT_fail(ctx, "%s %s: "
 				 "key and key_blob arguments are "
-				 "invalid with by=HASH (default)",
-				 who, p->vcl_name);
+				 "invalid with by=%s",
+				 who, p->vcl_name, by_s);
 			return (NULL);
 		}
+	} else {
+		WRONG("by enum");
 	}
+	p->by = by_s;
 
 	if (args & arg_alt) {
 		if (alt < 0) {
@@ -1040,8 +1006,7 @@ vmod_shard_param_get_by(VRT_CTX,
 	pp = vmod_shard_param_read(ctx, p, p, &pstk, "shard_param.get_by()");
 	if (pp == NULL)
 		return (NULL);
-	assert(pp->by > _BY_E_INVALID);
-	return (by_str[pp->by]);
+	return (default_by(pp->by));
 }
 
 VCL_INT v_matchproto_(td_directors_shard_param_get_key)

From phk at FreeBSD.org  Wed Aug  7 08:23:11 2019
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Wed,  7 Aug 2019 08:23:11 +0000 (UTC)
Subject: [master] 56d9cf802 Eliminate the detour over C-enum for 'resolve'
 argument
Message-ID: <20190807082311.479186388C@lists.varnish-cache.org>


commit 56d9cf802616fcffa21b708d0120fcd4f1ba2970
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Aug 7 08:06:45 2019 +0000

    Eliminate the detour over C-enum for 'resolve' argument

diff --git a/lib/libvmod_directors/Makefile.am b/lib/libvmod_directors/Makefile.am
index 706e24a30..73fccf7d5 100644
--- a/lib/libvmod_directors/Makefile.am
+++ b/lib/libvmod_directors/Makefile.am
@@ -13,9 +13,7 @@ libvmod_directors_la_SOURCES = \
 	shard_cfg.h \
 	shard_dir.c \
 	shard_dir.h \
-	tbl_by.h \
-	tbl_healthy.h \
-	tbl_resolve.h
+	tbl_healthy.h
 
 # Use vmodtool.py generated automake boilerplate
 include $(srcdir)/automake_boilerplate.am
diff --git a/lib/libvmod_directors/shard_dir.h b/lib/libvmod_directors/shard_dir.h
index 56d2e6633..d67b6a7bf 100644
--- a/lib/libvmod_directors/shard_dir.h
+++ b/lib/libvmod_directors/shard_dir.h
@@ -34,11 +34,6 @@ enum healthy_e {
 	_HEALTHY_E_MAX
 };
 
-enum resolve_e {
-#define VMODENUM(x) x,
-#include "tbl_resolve.h"
-};
-
 struct vbitmap;
 
 struct shard_circlepoint {
diff --git a/lib/libvmod_directors/tbl_by.h b/lib/libvmod_directors/tbl_by.h
deleted file mode 100644
index 97cb8287b..000000000
--- a/lib/libvmod_directors/tbl_by.h
+++ /dev/null
@@ -1,5 +0,0 @@
-VMODENUM(HASH)
-VMODENUM(URL)
-VMODENUM(KEY)
-VMODENUM(BLOB)
-#undef VMODENUM
diff --git a/lib/libvmod_directors/tbl_resolve.h b/lib/libvmod_directors/tbl_resolve.h
deleted file mode 100644
index c7c6d825d..000000000
--- a/lib/libvmod_directors/tbl_resolve.h
+++ /dev/null
@@ -1,3 +0,0 @@
-VMODENUM(NOW)
-VMODENUM(LAZY)
-#undef VMODENUM
diff --git a/lib/libvmod_directors/vmod_shard.c b/lib/libvmod_directors/vmod_shard.c
index a940ff346..906214551 100644
--- a/lib/libvmod_directors/vmod_shard.c
+++ b/lib/libvmod_directors/vmod_shard.c
@@ -190,14 +190,6 @@ parse_healthy_e(VCL_ENUM e)
        WRONG("illegal healthy enum");
 }
 
-static enum resolve_e
-parse_resolve_e(VCL_ENUM e)
-{
-#define VMODENUM(n) if (e == VENUM(n)) return(n);
-#include "tbl_resolve.h"
-       WRONG("illegal resolve enum");
-}
-
 static const char * const healthy_str[_HEALTHY_E_MAX] = {
 	[_HEALTHY_E_INVALID] = "*INVALID*",
 #define VMODENUM(n) [n] = #n,
@@ -608,7 +600,7 @@ vmod_shard_backend(VRT_CTX, struct vmod_directors_shard *vshard,
 	struct vmod_directors_shard_param pstk;
 	struct vmod_directors_shard_param *pp = NULL;
 	const struct vmod_directors_shard_param *ppt;
-	enum resolve_e resolve;
+	VCL_ENUM resolve;
 	uint32_t args = shard_backendarg_mask_(a);
 
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
@@ -616,14 +608,13 @@ vmod_shard_backend(VRT_CTX, struct vmod_directors_shard *vshard,
 	assert((args & ~arg_mask_) == 0);
 
 	if (args & arg_resolve)
-		resolve = parse_resolve_e(a->resolve);
+		resolve = a->resolve;
 	else if (ctx->method & VCL_MET_TASK_H)
-		resolve = LAZY;
+		resolve = VENUM(LAZY);
 	else
-		resolve = NOW;
+		resolve = VENUM(NOW);
 
-	switch (resolve) {
-	case LAZY:
+	if (resolve == VENUM(LAZY)) {
 		if ((args & ~arg_resolve) == 0) {
 			AN(vshard->dir);
 			return (vshard->dir);
@@ -643,8 +634,7 @@ vmod_shard_backend(VRT_CTX, struct vmod_directors_shard *vshard,
 		if (pp == NULL)
 			return (NULL);
 		pp->vcl_name = vshard->shardd->name;
-		break;
-	case NOW:
+	} else if (resolve == VENUM(NOW)) {
 		if (ctx->method & VCL_MET_TASK_H) {
 			VRT_fail(ctx,
 				 "shard .backend resolve=NOW can not be "
@@ -653,8 +643,7 @@ vmod_shard_backend(VRT_CTX, struct vmod_directors_shard *vshard,
 		}
 		pp = shard_param_stack(&pstk, vshard->shardd->param,
 				       vshard->shardd->name);
-		break;
-	default:
+	} else {
 		WRONG("resolve enum");
 	}
 
@@ -675,10 +664,10 @@ vmod_shard_backend(VRT_CTX, struct vmod_directors_shard *vshard,
 	if (pp == NULL)
 		return (NULL);
 
-	if (resolve == LAZY)
+	if (resolve == VENUM(LAZY))
 		return (vshard->dir);
 
-	assert(resolve == NOW);
+	assert(resolve == VENUM(NOW));
 	shard_param_merge(pp, pp->defaults);
 	return (sharddir_pick_be(ctx, vshard->shardd,
 				 shard_get_key(ctx, pp), pp->alt, pp->warmup,

From phk at FreeBSD.org  Wed Aug  7 08:23:11 2019
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Wed,  7 Aug 2019 08:23:11 +0000 (UTC)
Subject: [master] d00de5d7c Also eliminat C-enum detour for 'healthy' arguments
Message-ID: <20190807082311.61B6F63891@lists.varnish-cache.org>


commit d00de5d7ca7e8aa8653de26e77bc4c9f66cec759
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Aug 7 08:22:27 2019 +0000

    Also eliminat C-enum detour for 'healthy' arguments

diff --git a/lib/libvmod_directors/Makefile.am b/lib/libvmod_directors/Makefile.am
index 73fccf7d5..646357100 100644
--- a/lib/libvmod_directors/Makefile.am
+++ b/lib/libvmod_directors/Makefile.am
@@ -12,8 +12,7 @@ libvmod_directors_la_SOURCES = \
 	shard_cfg.c \
 	shard_cfg.h \
 	shard_dir.c \
-	shard_dir.h \
-	tbl_healthy.h
+	shard_dir.h
 
 # Use vmodtool.py generated automake boilerplate
 include $(srcdir)/automake_boilerplate.am
diff --git a/lib/libvmod_directors/shard_dir.c b/lib/libvmod_directors/shard_dir.c
index 4c707dc5e..db2c5be78 100644
--- a/lib/libvmod_directors/shard_dir.c
+++ b/lib/libvmod_directors/shard_dir.c
@@ -43,6 +43,7 @@
 #include "vsha256.h"
 #include "vend.h"
 
+#include "vcc_if.h"
 #include "shard_dir.h"
 
 struct shard_be_info {
@@ -323,7 +324,7 @@ sharddir_any_healthy(VRT_CTX, struct sharddir *shardd, VCL_TIME *changed)
 
 static VCL_BACKEND
 sharddir_pick_be_locked(VRT_CTX, const struct sharddir *shardd, uint32_t key,
-    VCL_INT alt, VCL_REAL warmup, VCL_BOOL rampup, enum healthy_e healthy,
+    VCL_INT alt, VCL_REAL warmup, VCL_BOOL rampup, VCL_ENUM healthy,
     struct shard_state *state)
 {
 	VCL_BACKEND be;
@@ -345,7 +346,8 @@ sharddir_pick_be_locked(VRT_CTX, const struct sharddir *shardd, uint32_t key,
 	    key, state->idx, shardd->hashcircle[state->idx].host);
 
 	if (alt > 0) {
-		if (shard_next(state, alt - 1, healthy == ALL ? 1 : 0) == -1) {
+		if (shard_next(state, alt - 1,
+		    healthy == VENUM(ALL) ? 1 : 0) == -1) {
 			if (state->previous.hostid != -1) {
 				be = sharddir_backend(shardd,
 				    state->previous.hostid);
@@ -356,7 +358,7 @@ sharddir_pick_be_locked(VRT_CTX, const struct sharddir *shardd, uint32_t key,
 		}
 	}
 
-	if (shard_next(state, 0, healthy == IGNORE ? 0 : 1) == -1) {
+	if (shard_next(state, 0, healthy == VENUM(IGNORE) ? 0 : 1) == -1) {
 		if (state->previous.hostid != -1) {
 			be = sharddir_backend(shardd, state->previous.hostid);
 			AN(be);
@@ -372,7 +374,7 @@ sharddir_pick_be_locked(VRT_CTX, const struct sharddir *shardd, uint32_t key,
 		warmup = shardd->warmup;
 
 	/* short path for cases we dont want ramup/warmup or can't */
-	if (alt > 0 || healthy == IGNORE || (!rampup && warmup == 0) ||
+	if (alt > 0 || healthy == VENUM(IGNORE) || (!rampup && warmup == 0) ||
 	    shard_next(state, 0, 1) == -1)
 		return (be);
 
@@ -415,7 +417,7 @@ sharddir_pick_be_locked(VRT_CTX, const struct sharddir *shardd, uint32_t key,
 
 VCL_BACKEND
 sharddir_pick_be(VRT_CTX, struct sharddir *shardd, uint32_t key, VCL_INT alt,
-    VCL_REAL warmup, VCL_BOOL rampup, enum healthy_e healthy)
+    VCL_REAL warmup, VCL_BOOL rampup, VCL_ENUM healthy)
 {
 	VCL_BACKEND be;
 	struct shard_state state[1];
diff --git a/lib/libvmod_directors/shard_dir.h b/lib/libvmod_directors/shard_dir.h
index d67b6a7bf..6d70a7603 100644
--- a/lib/libvmod_directors/shard_dir.h
+++ b/lib/libvmod_directors/shard_dir.h
@@ -27,13 +27,6 @@
  * SUCH DAMAGE.
  */
 
-enum healthy_e {
-	_HEALTHY_E_INVALID = 0,
-#define VMODENUM(x) x,
-#include "tbl_healthy.h"
-	_HEALTHY_E_MAX
-};
-
 struct vbitmap;
 
 struct shard_circlepoint {
@@ -116,7 +109,7 @@ void sharddir_wrlock(struct sharddir *shardd);
 void sharddir_unlock(struct sharddir *shardd);
 VCL_BOOL sharddir_any_healthy(VRT_CTX, struct sharddir *, VCL_TIME *);
 VCL_BACKEND sharddir_pick_be(VRT_CTX, struct sharddir *, uint32_t, VCL_INT,
-   VCL_REAL, VCL_BOOL, enum healthy_e);
+   VCL_REAL, VCL_BOOL, VCL_ENUM healthy);
 
 /* in shard_cfg.c */
 void shardcfg_delete(const struct sharddir *shardd);
diff --git a/lib/libvmod_directors/tbl_healthy.h b/lib/libvmod_directors/tbl_healthy.h
deleted file mode 100644
index 7be0e44a7..000000000
--- a/lib/libvmod_directors/tbl_healthy.h
+++ /dev/null
@@ -1,4 +0,0 @@
-VMODENUM(CHOSEN)
-VMODENUM(IGNORE)
-VMODENUM(ALL)
-#undef VMODENUM
diff --git a/lib/libvmod_directors/vmod_shard.c b/lib/libvmod_directors/vmod_shard.c
index 906214551..a5e07e14e 100644
--- a/lib/libvmod_directors/vmod_shard.c
+++ b/lib/libvmod_directors/vmod_shard.c
@@ -128,7 +128,7 @@ struct vmod_directors_shard_param {
 
 	/* parameters */
 	VCL_ENUM				by;
-	enum healthy_e				healthy;
+	VCL_ENUM				healthy;
 	uint32_t				mask;
 	VCL_BOOL				rampup;
 	VCL_INT					alt;
@@ -144,13 +144,13 @@ static const struct vmod_directors_shard_param shard_param_default = {
 	.scope		= SCOPE_VMOD,
 
 	.mask		= arg_mask_param_,
-	.healthy	= CHOSEN,
 	.rampup	= 1,
 	.alt		= 0,
 	.warmup		= -1,
 };
 
 #define default_by(ptr) (ptr == NULL ? VENUM(HASH) : ptr)
+#define default_healthy(ptr) (ptr == NULL ? VENUM(CHOSEN) : ptr)
 
 static struct vmod_directors_shard_param *
 shard_param_stack(struct vmod_directors_shard_param *p,
@@ -182,20 +182,6 @@ struct vmod_directors_shard {
 	VCL_BACKEND				dir;
 };
 
-static enum healthy_e
-parse_healthy_e(VCL_ENUM e)
-{
-#define VMODENUM(n) if (e == VENUM(n)) return(n);
-#include "tbl_healthy.h"
-       WRONG("illegal healthy enum");
-}
-
-static const char * const healthy_str[_HEALTHY_E_MAX] = {
-	[_HEALTHY_E_INVALID] = "*INVALID*",
-#define VMODENUM(n) [n] = #n,
-#include "tbl_healthy.h"
-};
-
 static void
 shard__assert(void)
 {
@@ -504,7 +490,6 @@ shard_param_args(VRT_CTX,
     uint32_t args, 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)
 {
-	enum healthy_e	healthy;
 
 	CHECK_OBJ_NOTNULL(p, VMOD_SHARD_SHARD_PARAM_MAGIC);
 	AN(p->vcl_name);
@@ -514,7 +499,6 @@ shard_param_args(VRT_CTX,
 	if (!(args & arg_by))
 		by_s = NULL;
 	by_s = default_by(by_s);
-	healthy = (args & arg_healthy) ? parse_healthy_e(healthy_s) : CHOSEN;
 
 	/* by_s / key_int / key_blob */
 	if (by_s == VENUM(KEY)) {
@@ -587,7 +571,7 @@ shard_param_args(VRT_CTX,
 		p->rampup = !!rampup;
 
 	if (args & arg_healthy)
-		p->healthy = healthy;
+		p->healthy = healthy_s;
 
 	p->mask = args & arg_mask_param_;
 	return (p);
@@ -1063,9 +1047,7 @@ vmod_shard_param_get_healthy(VRT_CTX,
 				   "shard_param.get_healthy()");
 	if (pp == NULL)
 		return (NULL);
-	assert(pp->healthy > _HEALTHY_E_INVALID);
-	return (healthy_str[pp->healthy]);
-
+	return (default_healthy(pp->healthy));
 }
 
 static const struct vmod_directors_shard_param *

From phk at FreeBSD.org  Wed Aug  7 08:23:11 2019
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Wed,  7 Aug 2019 08:23:11 +0000 (UTC)
Subject: [master] ee31c0b95 Merge branch 'master' of
 github.com:varnishcache/varnish-cache
Message-ID: <20190807082311.7E30763896@lists.varnish-cache.org>


commit ee31c0b95131fbf4d99034eaad2afc58aeea90f0
Merge: d00de5d7c d760826b4
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Aug 7 08:22:46 2019 +0000

    Merge branch 'master' of github.com:varnishcache/varnish-cache

From phk at FreeBSD.org  Wed Aug  7 09:10:11 2019
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Wed,  7 Aug 2019 09:10:11 +0000 (UTC)
Subject: [master] 222fd882f Remove (now) unused includes.
Message-ID: <20190807091011.87B7864E67@lists.varnish-cache.org>


commit 222fd882fae374f70cdce44f408d7639c584fe3d
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Aug 7 08:38:18 2019 +0000

    Remove (now) unused includes.

diff --git a/bin/varnishtest/vtc_http.c b/bin/varnishtest/vtc_http.c
index 8078ea645..2a411a97a 100644
--- a/bin/varnishtest/vtc_http.c
+++ b/bin/varnishtest/vtc_http.c
@@ -42,7 +42,6 @@
 
 #include "vct.h"
 #include "vfil.h"
-#include "vgz.h"
 #include "vnum.h"
 #include "vrnd.h"
 #include "vtcp.h"
diff --git a/bin/varnishtest/vtc_http2.c b/bin/varnishtest/vtc_http2.c
index d915b7e51..4f76c27cf 100644
--- a/bin/varnishtest/vtc_http2.c
+++ b/bin/varnishtest/vtc_http2.c
@@ -43,7 +43,6 @@
 #include "vtc_http.h"
 
 #include "vfil.h"
-#include "vgz.h"
 #include "hpack.h"
 #include "vend.h"
 

From phk at FreeBSD.org  Wed Aug  7 09:10:11 2019
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Wed,  7 Aug 2019 09:10:11 +0000 (UTC)
Subject: [master] bbff727de Merge from VTEST:
Message-ID: <20190807091011.9B61964E6D@lists.varnish-cache.org>


commit bbff727de37a20c56de1be18a13d2a81b5af7191
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Aug 7 08:47:37 2019 +0000

    Merge from VTEST:
    
        Author: Fr?d?ric L?caille <flecaille at haproxy.com>
        Date:   Mon Jul 15 15:20:07 2019 +0200
    
        Open and close a TCP socket to simulate an unreachable server.
    
        This is done for each haproxy instance. The socket address (resp. port)
        may be referenced by ${<name>_closed_addr} (resp. ${<name>_closed_port})
        variable where <name> is the haproxy instance name.

diff --git a/bin/varnishtest/vtc_haproxy.c b/bin/varnishtest/vtc_haproxy.c
index ccd0fba80..b24af08ca 100644
--- a/bin/varnishtest/vtc_haproxy.c
+++ b/bin/varnishtest/vtc_haproxy.c
@@ -89,6 +89,7 @@ struct haproxy {
 
 	char			*workdir;
 	struct vsb		*msgs;
+	char			closed_sock[256]; /* Closed TCP socket */
 	VTAILQ_HEAD(,envar) envars;
 };
 
@@ -494,6 +495,9 @@ haproxy_new(const char *name)
 	struct haproxy *h;
 	struct vsb *vsb;
 	char buf[PATH_MAX];
+	int closed_sock;
+	char addr[128], port[128];
+	const char *err;
 
 	ALLOC_OBJ(h, HAPROXY_MAGIC);
 	AN(h);
@@ -523,6 +527,21 @@ haproxy_new(const char *name)
 	h->cfg_fn = strdup(buf);
 	AN(h->cfg_fn);
 
+	/* Create a new TCP socket to reserve an IP:port and close it asap.
+	 * May be useful to simulate an unreachable server.
+	 */
+	bprintf(h->closed_sock, "%s_closed", h->name);
+	closed_sock = VTCP_listen_on("localhost:0", NULL, 100, &err);
+	if (err != NULL)
+		vtc_fatal(h->vl,
+			"Create listen socket failed: %s", err);
+	assert(closed_sock > 0);
+	VTCP_myname(closed_sock, addr, sizeof addr, port, sizeof port);
+	macro_def(h->vl, h->closed_sock, "sock", "%s %s", addr, port);
+	macro_def(h->vl, h->closed_sock, "addr", "%s", addr);
+	macro_def(h->vl, h->closed_sock, "port", "%s", port);
+	VTCP_close(&closed_sock);
+
 	h->cli = haproxy_cli_new(h);
 	AN(h->cli);
 

From phk at FreeBSD.org  Wed Aug  7 09:10:11 2019
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Wed,  7 Aug 2019 09:10:11 +0000 (UTC)
Subject: [master] ea6fb878b Be consistent about bodylen being a long
Message-ID: <20190807091011.B714964E75@lists.varnish-cache.org>


commit ea6fb878bb1e5b6d7bef2fa404ec16fa14aaf700
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Aug 7 08:59:28 2019 +0000

    Be consistent about bodylen being a long

diff --git a/bin/varnishtest/vtc.h b/bin/varnishtest/vtc.h
index 61c8dcb2d..2a8480b14 100644
--- a/bin/varnishtest/vtc.h
+++ b/bin/varnishtest/vtc.h
@@ -131,8 +131,8 @@ void stop_h2(struct http *hp);
 void b64_settings(const struct http *hp, const char *s);
 
 /* vtc_gzip.c */
-void vtc_gzip(struct http *, const char *, char **, unsigned *);
-void vtc_gunzip(struct http *, char *, unsigned *);
+void vtc_gzip(const struct http *, const char *, char **, unsigned *);
+void vtc_gunzip(struct http *, char *, long *);
 
 /* vtc_subr.c */
 struct vsb *vtc_hex_to_bin(struct vtclog *vl, const char *arg);
diff --git a/bin/varnishtest/vtc_gzip.c b/bin/varnishtest/vtc_gzip.c
index 9eeb67a51..a0b35bc1a 100644
--- a/bin/varnishtest/vtc_gzip.c
+++ b/bin/varnishtest/vtc_gzip.c
@@ -26,6 +26,8 @@
  * SUCH DAMAGE.
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -38,7 +40,7 @@
 
 
 void
-vtc_gzip(struct http *hp, const char *input, char **body, unsigned *bodylen)
+vtc_gzip(const struct http *hp, const char *input, char **body, unsigned *bodylen)
 {
 	unsigned l;
 	z_stream vz;
@@ -82,7 +84,7 @@ vtc_gzip(struct http *hp, const char *input, char **body, unsigned *bodylen)
 }
 
 void
-vtc_gunzip(struct http *hp, char *body, unsigned *bodylen)
+vtc_gunzip(struct http *hp, char *body, long *bodylen)
 {
 	z_stream vz;
 	char *p;
@@ -111,9 +113,9 @@ vtc_gunzip(struct http *hp, char *body, unsigned *bodylen)
 	*bodylen = vz.total_out;
 	memcpy(body, p, *bodylen);
 	free(p);
-	vtc_log(hp->vl, 3, "new bodylen %u", *bodylen);
+	vtc_log(hp->vl, 3, "new bodylen %ld", *bodylen);
 	vtc_dump(hp->vl, 4, "body", body, *bodylen);
-	bprintf(hp->bodylen, "%u", *bodylen);
+	bprintf(hp->bodylen, "%ld", *bodylen);
 #ifdef VGZ_EXTENSIONS
 	vtc_log(hp->vl, 4, "startbit = %ju %ju/%ju",
 	    (uintmax_t)vz.start_bit,
diff --git a/bin/varnishtest/vtc_http.c b/bin/varnishtest/vtc_http.c
index 2a411a97a..6bbbb79fd 100644
--- a/bin/varnishtest/vtc_http.c
+++ b/bin/varnishtest/vtc_http.c
@@ -763,7 +763,7 @@ cmd_http_gunzip(CMD_ARGS)
 	(void)vl;
 
 	CAST_OBJ_NOTNULL(hp, priv, HTTP_MAGIC);
-	vtc_gunzip(hp, hp->body, (unsigned *)&hp->bodyl);
+	vtc_gunzip(hp, hp->body, &hp->bodyl);
 }
 
 /**********************************************************************
diff --git a/bin/varnishtest/vtc_http.h b/bin/varnishtest/vtc_http.h
index d9241ff2b..0091eaa1a 100644
--- a/bin/varnishtest/vtc_http.h
+++ b/bin/varnishtest/vtc_http.h
@@ -47,7 +47,7 @@ struct http {
 	char			*rem_port;
 	char			*rem_path;
 	char			*body;
-	unsigned		bodyl;
+	long			bodyl;
 	char			bodylen[20];
 	char			chunklen[20];
 
diff --git a/bin/varnishtest/vtc_http2.c b/bin/varnishtest/vtc_http2.c
index 4f76c27cf..0c88ba5c7 100644
--- a/bin/varnishtest/vtc_http2.c
+++ b/bin/varnishtest/vtc_http2.c
@@ -2484,7 +2484,7 @@ cmd_gunzip(CMD_ARGS)
 	hp = s->hp;
 	CHECK_OBJ_NOTNULL(hp, HTTP_MAGIC);
 
-	vtc_gunzip(s->hp, s->body, (unsigned *)&s->bodylen);
+	vtc_gunzip(s->hp, s->body, &s->bodylen);
 }
 
 /* SECTION: stream.spec.write_body

From phk at FreeBSD.org  Wed Aug  7 09:10:11 2019
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Wed,  7 Aug 2019 09:10:11 +0000 (UTC)
Subject: [master] 739e4d58e Also be consistent about bodylen being long on
 gzip side
Message-ID: <20190807091011.D579764E7D@lists.varnish-cache.org>


commit 739e4d58e417a492e28fab5bd39b12fc46aaced1
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Aug 7 09:08:26 2019 +0000

    Also be consistent about bodylen being long on gzip side

diff --git a/bin/varnishtest/vtc.h b/bin/varnishtest/vtc.h
index 2a8480b14..e1f167daa 100644
--- a/bin/varnishtest/vtc.h
+++ b/bin/varnishtest/vtc.h
@@ -131,7 +131,7 @@ void stop_h2(struct http *hp);
 void b64_settings(const struct http *hp, const char *s);
 
 /* vtc_gzip.c */
-void vtc_gzip(const struct http *, const char *, char **, unsigned *);
+void vtc_gzip(const struct http *, const char *, char **, long *);
 void vtc_gunzip(struct http *, char *, long *);
 
 /* vtc_subr.c */
diff --git a/bin/varnishtest/vtc_gzip.c b/bin/varnishtest/vtc_gzip.c
index a0b35bc1a..ab42c68c6 100644
--- a/bin/varnishtest/vtc_gzip.c
+++ b/bin/varnishtest/vtc_gzip.c
@@ -40,7 +40,7 @@
 
 
 void
-vtc_gzip(const struct http *hp, const char *input, char **body, unsigned *bodylen)
+vtc_gzip(const struct http *hp, const char *input, char **body, long *bodylen)
 {
 	unsigned l;
 	z_stream vz;
diff --git a/bin/varnishtest/vtc_http.c b/bin/varnishtest/vtc_http.c
index 6bbbb79fd..b8b9de4a7 100644
--- a/bin/varnishtest/vtc_http.c
+++ b/bin/varnishtest/vtc_http.c
@@ -774,7 +774,7 @@ static char* const *
 http_tx_parse_args(char * const *av, struct vtclog *vl, struct http *hp,
     char *body, unsigned nohost)
 {
-	int bodylen = 0;
+	long bodylen = 0;
 	char *b, *c;
 	char *nullbody;
 	char *m;
@@ -847,7 +847,7 @@ http_tx_parse_args(char * const *av, struct vtclog *vl, struct http *hp,
 			assert(body == nullbody);
 			free(body);
 			b = synth_body(av[1], 1);
-			vtc_gzip(hp, b, &body, (unsigned *)&bodylen);
+			vtc_gzip(hp, b, &body, &bodylen);
 			free(b);
 			VSB_printf(hp->vsb, "Content-Encoding: gzip%s", nl);
 			// vtc_hexdump(hp->vl, 4, "gzip", (void*)body, bodylen);
@@ -855,7 +855,7 @@ http_tx_parse_args(char * const *av, struct vtclog *vl, struct http *hp,
 		} else if (!strcmp(*av, "-gzipbody")) {
 			assert(body == nullbody);
 			free(body);
-			vtc_gzip(hp, av[1], &body, (unsigned *)&bodylen);
+			vtc_gzip(hp, av[1], &body, &bodylen);
 			VSB_printf(hp->vsb, "Content-Encoding: gzip%s", nl);
 			// vtc_hexdump(hp->vl, 4, "gzip", (void*)body, bodylen);
 			av++;
@@ -869,7 +869,7 @@ http_tx_parse_args(char * const *av, struct vtclog *vl, struct http *hp,
 		free(m);
 	}
 	if (body != NULL && !nolen)
-		VSB_printf(hp->vsb, "Content-Length: %d%s", bodylen, nl);
+		VSB_printf(hp->vsb, "Content-Length: %ld%s", bodylen, nl);
 	VSB_cat(hp->vsb, nl);
 	if (body != NULL) {
 		VSB_bcat(hp->vsb, body, bodylen);
diff --git a/bin/varnishtest/vtc_http2.c b/bin/varnishtest/vtc_http2.c
index 0c88ba5c7..0e7bdea7f 100644
--- a/bin/varnishtest/vtc_http2.c
+++ b/bin/varnishtest/vtc_http2.c
@@ -1381,7 +1381,7 @@ cmd_tx11obj(CMD_ARGS)
 	int method_done = 1;
 	int path_done = 1;
 	int scheme_done = 1;
-	int bodylen = 0;
+	long bodylen = 0;
 	ssize_t len;
 	uint32_t stid = 0, pstid;
 	uint32_t weight = 16;
@@ -1550,8 +1550,7 @@ cmd_tx11obj(CMD_ARGS)
 			}
 			else if (!strcmp(*av, "-gzipbody")) {
 				AZ(body);
-				vtc_gzip(s->hp, av[1], &body,
-				    (unsigned *)&bodylen);
+				vtc_gzip(s->hp, av[1], &body, &bodylen);
 				AN(body);
 				ENC(hdr, ":content-encoding", "gzip");
 				f.flags &= ~END_STREAM;
@@ -1560,8 +1559,7 @@ cmd_tx11obj(CMD_ARGS)
 			else if (!strcmp(*av, "-gziplen")) {
 				AZ(body);
 				b = synth_body(av[1], 1);
-				vtc_gzip(s->hp, b, &body,
-				    (unsigned *)&bodylen);
+				vtc_gzip(s->hp, b, &body, &bodylen);
 				AN(body);
 				free(b);
 				ENC(hdr, ":content-encoding", "gzip");

From denes.matetelki at gmail.com  Thu Aug  1 13:55:10 2019
From: denes.matetelki at gmail.com (Denes Matetelki)
Date: Thu,  1 Aug 2019 13:55:10 +0000 (UTC)
Subject: [master] e7828205c Docfix: varnishlog and varnishncsa exits from
 SIGHUP in the foreground
Message-ID: <20190801135510.AB5E5B1177@lists.varnish-cache.org>


commit e7828205c4257cac249604f14c2bed78787c318d
Author: Denes Matetelki <dmatetelki at varnish-software.com>
Date:   Mon Jul 22 14:07:44 2019 +0200

    Docfix: varnishlog and varnishncsa exits from SIGHUP in the foreground
    
    Be a bit more elaborate on the expected behaviour

diff --git a/doc/sphinx/reference/varnishlog.rst b/doc/sphinx/reference/varnishlog.rst
index d94c333b0..f93d5d623 100644
--- a/doc/sphinx/reference/varnishlog.rst
+++ b/doc/sphinx/reference/varnishlog.rst
@@ -30,7 +30,8 @@ SIGNALS
 
 * SIGHUP
 
-  Rotate the log file (see -w option)
+  Rotate the log file (see -w option) in daemon mode,
+  abort the loop and die gracefully when running in the foreground.
 
 * SIGUSR1
 
diff --git a/doc/sphinx/reference/varnishncsa.rst b/doc/sphinx/reference/varnishncsa.rst
index 9c959d3ae..09eac91bd 100644
--- a/doc/sphinx/reference/varnishncsa.rst
+++ b/doc/sphinx/reference/varnishncsa.rst
@@ -196,10 +196,13 @@ Supported formatters are:
 SIGNALS
 =======
 
-SIGHUP
-  Rotate the log file (see -w option).
+* SIGHUP
+
+  Rotate the log file (see -w option) in daemon mode,
+  abort the loop and die gracefully when running in the foreground.
+
+* SIGUSR1
 
-SIGUSR1
   Flush any outstanding transactions.
 
 NOTES

From denes.matetelki at gmail.com  Thu Aug  1 14:13:11 2019
From: denes.matetelki at gmail.com (Denes Matetelki)
Date: Thu,  1 Aug 2019 14:13:11 +0000 (UTC)
Subject: [master] 1af1ff4f8 Typo. A director having two backends with the same
 IP is confusing
Message-ID: <20190801141311.8A38FB174E@lists.varnish-cache.org>


commit 1af1ff4f8ddb360859cb946f1c282add66f41bd0
Author: Denes Matetelki <dmatetelki at varnish-software.com>
Date:   Mon Jul 22 13:55:46 2019 +0200

    Typo. A director having two backends with the same IP is confusing

diff --git a/doc/sphinx/users-guide/vcl-backends.rst b/doc/sphinx/users-guide/vcl-backends.rst
index 7867140eb..24d0dec7d 100644
--- a/doc/sphinx/users-guide/vcl-backends.rst
+++ b/doc/sphinx/users-guide/vcl-backends.rst
@@ -131,7 +131,7 @@ call certain actions in `vcl_init`.::
         .host = "192.168.0.10";
     }
     backend server2 {
-        .host = "192.168.0.10";
+        .host = "192.168.0.11";
     }
 
     sub vcl_init {

From phk at FreeBSD.org  Tue Aug 13 11:10:10 2019
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Tue, 13 Aug 2019 11:10:10 +0000 (UTC)
Subject: [master] c1e9a3adb More Flexelint 9xx tuning
Message-ID: <20190813111010.0DD64BE555@lists.varnish-cache.org>


commit c1e9a3adb485cae1a8e9cf757569f1f9d9ce79d2
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Aug 7 11:49:17 2019 +0000

    More Flexelint 9xx tuning

diff --git a/flint.lnt b/flint.lnt
index 60b530678..7b24a4aeb 100644
--- a/flint.lnt
+++ b/flint.lnt
@@ -10,24 +10,35 @@
 //+e9*
 -e904
 -e935
--e955   
+-e955
+-e956
 //+e958   // report internal struct padding
 //+e959   // report struct tail/size padding
 -e960
+-e961
+-efile(966, "/usr/include/*")	// unused indir include
+-efile(966, "../../include/tbl/*")
 -e964
 -e970
+-e971
 -e9012
 -e9021
 -e9022
+-e9023
 -e9024
 -e9026
 -e9034
+-e9037
 -e9042
+-e9048
+-e9050
+-e9051
 -e9067
 +e9071	// defined macro '...' is reserved to the compiler
 +e9075	// external symbol without declaration
 -esym(9075, main)
 -e9085
+-e9105
 -e9107
 -e9109
 -e9113
@@ -52,6 +63,7 @@
 
 -efile(451, "tbl/*.h")		// No include guard
 -efile(537, "tbl/*.h")		// Repeated include
+-efile(967, "tbl/*.h")		// No include guard
 
 -efile(451, "../../include/vut_options.h")		// No include guard
 -efile(451, "../../include/vapi/vapi_options.h")	// No include guard

From phk at FreeBSD.org  Tue Aug 13 11:10:10 2019
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Tue, 13 Aug 2019 11:10:10 +0000 (UTC)
Subject: [master] 5902f53ee Refactor code a bit
Message-ID: <20190813111010.23506BE558@lists.varnish-cache.org>


commit 5902f53ee142c80041b20cd844f4a9b78723b6d0
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Aug 7 12:16:40 2019 +0000

    Refactor code a bit

diff --git a/lib/libvarnishapi/vsm.c b/lib/libvarnishapi/vsm.c
index c220a31ee..7e9f950ec 100644
--- a/lib/libvarnishapi/vsm.c
+++ b/lib/libvarnishapi/vsm.c
@@ -285,6 +285,25 @@ vsm_delset(struct vsm_set **p)
 	FREE_OBJ(vs);
 }
 
+static void
+vsm_wash_set(struct vsm_set *vs, int all)
+{
+	struct vsm_seg *vg, *vg2;
+
+	VTAILQ_FOREACH_SAFE(vg, &vs->segs, list, vg2) {
+		if (all || (vg->flags & VSM_FLAG_MARKSCAN) == 0) {
+			VTAILQ_REMOVE(&vs->segs, vg, list);
+			if (vg->refs) {
+				vg->flags |= VSM_FLAG_STALE;
+				VTAILQ_INSERT_TAIL(&vs->stale, vg, list);
+			} else {
+				VAV_Free(vg->av);
+				FREE_OBJ(vg);
+			}
+		}
+	}
+}
+
 /*--------------------------------------------------------------------*/
 
 struct vsm *
@@ -393,8 +412,6 @@ VSM_ResetError(struct vsm *vd)
 /*--------------------------------------------------------------------
  */
 
-#define VSM_NUKE_ALL	(1U << 16)
-
 static int
 vsm_cmp_av(char * const *a1, char * const *a2)
 {
@@ -563,7 +580,7 @@ vsm_vlu_func(void *priv, const char *line)
 }
 
 static unsigned
-vsm_refresh_set2(struct vsm *vd, struct vsm_set *vs)
+vsm_refresh_set(struct vsm *vd, struct vsm_set *vs)
 {
 	struct stat st;
 	int i;
@@ -576,7 +593,8 @@ vsm_refresh_set2(struct vsm *vd, struct vsm_set *vs)
 		if (fstatat(vd->dfd, vs->dname, &st, AT_SYMLINK_NOFOLLOW)) {
 			closefd(&vs->dfd);
 			vs->id1 = vs->id2 = 0;
-			return (VSM_MGT_RESTARTED|VSM_NUKE_ALL);
+			vsm_wash_set(vs, 1);
+			return (VSM_MGT_RESTARTED|VSM_MGT_CHANGED);
 		}
 		if (st.st_ino != vs->dst.st_ino ||
 		    st.st_dev != vs->dst.st_dev ||
@@ -593,7 +611,8 @@ vsm_refresh_set2(struct vsm *vd, struct vsm_set *vs)
 		vs->retval |= VSM_MGT_RESTARTED;
 		if (vs->dfd < 0) {
 			vs->id1 = vs->id2 = 0;
-			return (vs->retval|VSM_NUKE_ALL);
+			vsm_wash_set(vs, 1);
+			return (vs->retval|VSM_MGT_CHANGED);
 		}
 		AZ(fstat(vs->dfd, &vs->dst));
 	}
@@ -631,34 +650,10 @@ vsm_refresh_set2(struct vsm *vd, struct vsm_set *vs)
 	} while (!i);
 	assert(i == -2);
 	VLU_Destroy(&vlu);
+	vsm_wash_set(vs, 0);
 	return (vs->retval);
 }
 
-static unsigned
-vsm_refresh_set(struct vsm *vd, struct vsm_set *vs)
-{
-	unsigned retval;
-	struct vsm_seg *vg, *vg2;
-
-	retval = vsm_refresh_set2(vd, vs);
-	if (retval & VSM_NUKE_ALL)
-		retval |= VSM_MGT_CHANGED;
-	VTAILQ_FOREACH_SAFE(vg, &vs->segs, list, vg2) {
-		if ((vg->flags & VSM_FLAG_MARKSCAN) == 0 ||
-		    (retval & VSM_NUKE_ALL)) {
-			VTAILQ_REMOVE(&vs->segs, vg, list);
-			if (vg->refs) {
-				vg->flags |= VSM_FLAG_STALE;
-				VTAILQ_INSERT_TAIL(&vs->stale, vg, list);
-			} else {
-				VAV_Free(vg->av);
-				FREE_OBJ(vg);
-			}
-		}
-	}
-	return (retval & ~VSM_NUKE_ALL);
-}
-
 /*--------------------------------------------------------------------*/
 
 unsigned

From phk at FreeBSD.org  Tue Aug 13 11:10:10 2019
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Tue, 13 Aug 2019 11:10:10 +0000 (UTC)
Subject: [master] 32f503efe Refactor & Polish
Message-ID: <20190813111010.3D612BE55B@lists.varnish-cache.org>


commit 32f503efea667eb7fc856a4a14e521c382c547cf
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Aug 7 13:34:22 2019 +0000

    Refactor & Polish

diff --git a/lib/libvarnishapi/vsm.c b/lib/libvarnishapi/vsm.c
index 7e9f950ec..79411d783 100644
--- a/lib/libvarnishapi/vsm.c
+++ b/lib/libvarnishapi/vsm.c
@@ -113,6 +113,10 @@ struct vsm_set {
 	// _.index reading state
 	unsigned		retval;
 	struct vsm_seg		*vg;
+
+	unsigned		flag_running;
+	unsigned		flag_changed;
+	unsigned		flag_restarted;
 };
 
 struct vsm {
@@ -122,9 +126,9 @@ struct vsm {
 	struct vsb		*diag;
 	uintptr_t		serial;
 
-	int			dfd;
-	struct stat		dst;
-	char			*dname;
+	int			wdfd;
+	struct stat		wdst;
+	char			*wdname;
 
 	struct vsm_set		*mgt;
 	struct vsm_set		*child;
@@ -186,7 +190,7 @@ vsm_mapseg(struct vsm *vd, struct vsm_seg *vg)
 
 	vsb = VSB_new_auto();
 	AN(vsb);
-	VSB_printf(vsb, "%s/%s/%s", vd->dname, vg->set->dname, vg->av[1]);
+	VSB_printf(vsb, "%s/%s/%s", vd->wdname, vg->set->dname, vg->av[1]);
 	AZ(VSB_finish(vsb));
 
 	fd = open(VSB_data(vsb), O_RDONLY);	// XXX: openat
@@ -315,10 +319,18 @@ VSM_New(void)
 	AN(vd);
 
 	vd->mgt = vsm_newset(VSM_MGT_DIRNAME);
+	vd->mgt->flag_running = VSM_MGT_RUNNING;
+	vd->mgt->flag_changed = VSM_MGT_CHANGED;
+	vd->mgt->flag_restarted = VSM_MGT_RESTARTED;
+
 	vd->child = vsm_newset(VSM_CHILD_DIRNAME);
+	vd->child->flag_running = VSM_WRK_RUNNING;
+	vd->child->flag_changed = VSM_WRK_CHANGED;
+	vd->child->flag_restarted = VSM_WRK_RESTARTED;
+
 	vd->mgt->vsm = vd;
 	vd->child->vsm = vd;
-	vd->dfd = -1;
+	vd->wdfd = -1;
 	vd->patience = 5;
 	if (getenv("VSM_NOPID") != NULL)
 		vd->couldkill = -1;
@@ -353,7 +365,7 @@ VSM_Arg(struct vsm *vd, char flag, const char *arg)
 			return (vsm_diag(vd, "Invalid instance name: %s",
 			    strerror(errno)));
 		AN(p);
-		REPLACE(vd->dname, p);
+		REPLACE(vd->wdname, p);
 		free(p);
 		break;
 	default:
@@ -372,11 +384,11 @@ VSM_Destroy(struct vsm **vdp)
 	TAKE_OBJ_NOTNULL(vd, vdp, VSM_MAGIC);
 
 	VSM_ResetError(vd);
-	REPLACE(vd->dname, NULL);
+	REPLACE(vd->wdname, NULL);
 	if (vd->diag != NULL)
 		VSB_destroy(&vd->diag);
-	if (vd->dfd >= 0)
-		closefd(&vd->dfd);
+	if (vd->wdfd >= 0)
+		closefd(&vd->wdfd);
 	vsm_delset(&vd->mgt);
 	vsm_delset(&vd->child);
 	FREE_OBJ(vd);
@@ -564,7 +576,7 @@ vsm_vlu_func(void *priv, const char *line)
 		i = vsm_vlu_hash(vd, vs, line);
 		VTAILQ_FOREACH(vs->vg, &vs->segs, list)
 			vs->vg->flags &= ~VSM_FLAG_MARKSCAN;
-		if (!(vs->retval & VSM_MGT_RESTARTED))
+		if (!(vs->retval & vs->flag_restarted))
 			vs->vg = VTAILQ_FIRST(&vs->segs);
 		break;
 	case '+':
@@ -590,29 +602,27 @@ vsm_refresh_set(struct vsm *vd, struct vsm_set *vs)
 	CHECK_OBJ_NOTNULL(vs, VSM_SET_MAGIC);
 	vs->retval = 0;
 	if (vs->dfd >= 0) {
-		if (fstatat(vd->dfd, vs->dname, &st, AT_SYMLINK_NOFOLLOW)) {
-			closefd(&vs->dfd);
-			vs->id1 = vs->id2 = 0;
-			vsm_wash_set(vs, 1);
-			return (VSM_MGT_RESTARTED|VSM_MGT_CHANGED);
-		}
-		if (st.st_ino != vs->dst.st_ino ||
+		if (fstatat(vd->wdfd, vs->dname, &st, AT_SYMLINK_NOFOLLOW) ||
+		    st.st_ino != vs->dst.st_ino ||
 		    st.st_dev != vs->dst.st_dev ||
-		    st.st_mode != vs->dst.st_mode) {
+		    st.st_mode != vs->dst.st_mode ||
+		    st.st_nlink == 0) {
 			closefd(&vs->dfd);
 			vs->id1 = vs->id2 = 0;
+			vsm_wash_set(vs, 1);
+			vs->retval |= vs->flag_restarted;
 		}
 	}
 
 	if (vs->dfd < 0) {
 		if (vs->fd >= 0)
 			closefd(&vs->fd);
-		vs->dfd = openat(vd->dfd, vs->dname, O_RDONLY);
-		vs->retval |= VSM_MGT_RESTARTED;
+		vs->dfd = openat(vd->wdfd, vs->dname, O_RDONLY);
 		if (vs->dfd < 0) {
 			vs->id1 = vs->id2 = 0;
 			vsm_wash_set(vs, 1);
-			return (vs->retval|VSM_MGT_CHANGED);
+			vs->retval |= vs->flag_restarted;
+			return (vs->retval);
 		}
 		AZ(fstat(vs->dfd, &vs->dst));
 	}
@@ -630,14 +640,14 @@ vsm_refresh_set(struct vsm *vd, struct vsm_set *vs)
 
 	if (vs->fd >= 0) {
 		if (vd->couldkill < 1 || !kill(vs->id1, 0))
-			vs->retval |= VSM_MGT_RUNNING;
+			vs->retval |= vs->flag_running;
 		return (vs->retval);
 	}
 
-	vs->retval |= VSM_MGT_CHANGED;
+	vs->retval |= vs->flag_changed;
 	vs->fd = openat(vs->dfd, "_.index", O_RDONLY);
 	if (vs->fd < 0)
-		return (vs->retval|VSM_MGT_RESTARTED);
+		return (vs->retval|vs->flag_restarted);
 
 	AZ(fstat(vs->fd, &vs->fst));
 
@@ -659,38 +669,41 @@ vsm_refresh_set(struct vsm *vd, struct vsm_set *vs)
 unsigned
 VSM_Status(struct vsm *vd)
 {
-	unsigned retval = 0, u;
+	unsigned retval = 0;
 	struct stat st;
 
 	CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);
 
 	/* See if the -n workdir changed */
-	if (vd->dfd >= 0) {
-		AZ(fstat(vd->dfd, &st));
-		if (st.st_ino != vd->dst.st_ino ||
-		    st.st_dev != vd->dst.st_dev ||
-		    st.st_mode != vd->dst.st_mode ||
+	if (vd->wdfd >= 0) {
+		AZ(fstat(vd->wdfd, &st));
+		if (st.st_ino != vd->wdst.st_ino ||
+		    st.st_dev != vd->wdst.st_dev ||
+		    st.st_mode != vd->wdst.st_mode ||
 		    st.st_nlink == 0) {
-			closefd(&vd->dfd);
-			retval |= VSM_MGT_CHANGED;
-			retval |= VSM_WRK_CHANGED;
+			closefd(&vd->wdfd);
+			vsm_wash_set(vd->mgt, 1);
+			vsm_wash_set(vd->child, 1);
 		}
 	}
 
 	/* Open workdir */
-	if (vd->dfd < 0) {
-		vd->dfd = open(vd->dname, O_RDONLY);
-		if (vd->dfd < 0)
+	if (vd->wdfd < 0) {
+		retval |= VSM_MGT_RESTARTED | VSM_MGT_CHANGED;
+		retval |= VSM_WRK_RESTARTED | VSM_MGT_CHANGED;
+		vd->wdfd = open(vd->wdname, O_RDONLY);
+		if (vd->wdfd < 0)
 			(void)vsm_diag(vd,
 			    "VSM_Status: Cannot open workdir");
 		else
-			AZ(fstat(vd->dfd, &vd->dst));
+			AZ(fstat(vd->wdfd, &vd->wdst));
 	}
 
-	u = vsm_refresh_set(vd, vd->mgt);
-	retval |= u;
-	if (u & VSM_MGT_RUNNING)
-		retval |= vsm_refresh_set(vd, vd->child) << 8;
+	if (vd->wdfd >= 0) {
+		retval |= vsm_refresh_set(vd, vd->mgt);
+		if (retval & VSM_MGT_RUNNING)
+			retval |= vsm_refresh_set(vd, vd->child);
+	}
 	return (retval);
 }
 
@@ -710,12 +723,12 @@ VSM_Attach(struct vsm *vd, int progress)
 	else
 		t0 = VTIM_mono() + vd->patience;
 
-	if (vd->dname == NULL) {
+	if (vd->wdname == NULL) {
 		/* Use default (hostname) */
 		i = VSM_Arg(vd, 'n', "");
 		if (i < 0)
 			return (i);
-		AN(vd->dname);
+		AN(vd->wdname);
 	}
 
 	AZ(vd->attached);

From phk at FreeBSD.org  Tue Aug 13 11:10:10 2019
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Tue, 13 Aug 2019 11:10:10 +0000 (UTC)
Subject: [master] 17b30b617 Add a VLU_Reset() function
Message-ID: <20190813111010.5A894BE560@lists.varnish-cache.org>


commit 17b30b617831737896650027eb9dff5f06478c36
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Aug 8 08:24:13 2019 +0000

    Add a VLU_Reset() function

diff --git a/include/vlu.h b/include/vlu.h
index 47cf705f5..8ce98dd3f 100644
--- a/include/vlu.h
+++ b/include/vlu.h
@@ -34,6 +34,7 @@
 
 typedef int (vlu_f)(void *, const char *);
 struct vlu *VLU_New(vlu_f *, void *, unsigned);
+void VLU_Reset(struct vlu *);
 int VLU_Fd(struct vlu *, int);
 void VLU_Destroy(struct vlu **);
 int VLU_File(int, vlu_f *, void *, unsigned);
diff --git a/lib/libvarnish/vlu.c b/lib/libvarnish/vlu.c
index 536b792d4..7b4eb90db 100644
--- a/lib/libvarnish/vlu.c
+++ b/lib/libvarnish/vlu.c
@@ -72,6 +72,13 @@ VLU_New(vlu_f *func, void *priv, unsigned bufsize)
 	return (l);
 }
 
+void
+VLU_Reset(struct vlu *l)
+{
+	CHECK_OBJ_NOTNULL(l, LINEUP_MAGIC);
+	l->bufp = 0;
+}
+
 void
 VLU_Destroy(struct vlu **lp)
 {

From phk at FreeBSD.org  Tue Aug 13 11:10:10 2019
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Tue, 13 Aug 2019 11:10:10 +0000 (UTC)
Subject: [master] 9bf8ee9ce Destroy the childs Param and Panicstr VSMs properly
Message-ID: <20190813111010.75A41BE56B@lists.varnish-cache.org>


commit 9bf8ee9ce4d70d12f4fd8439dcb16d41037fc266
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Aug 8 11:08:34 2019 +0000

    Destroy the childs Param and Panicstr VSMs properly

diff --git a/bin/varnishd/mgt/mgt_shmem.c b/bin/varnishd/mgt/mgt_shmem.c
index 90e966f0e..574513413 100644
--- a/bin/varnishd/mgt/mgt_shmem.c
+++ b/bin/varnishd/mgt/mgt_shmem.c
@@ -142,6 +142,6 @@ mgt_SHM_ChildDestroy(void)
 		AZ(system("rm -rf " VSM_CHILD_DIRNAME));
 		VJ_master(JAIL_MASTER_LOW);
 	}
-	heritage.panic_str = NULL;
-	heritage.param = NULL;
+	VSMW_Free(mgt_vsmw, (void**)&heritage.panic_str);
+	VSMW_Free(mgt_vsmw, (void**)&heritage.param);
 }

From phk at FreeBSD.org  Tue Aug 13 11:10:10 2019
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Tue, 13 Aug 2019 11:10:10 +0000 (UTC)
Subject: [master] ea995d696 Only emit the '-' line when the cluster is empty.
Message-ID: <20190813111010.8F00EBE575@lists.varnish-cache.org>


commit ea995d6966fcd2da2b2783b779371f557e8301c8
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Aug 8 14:12:21 2019 +0000

    Only emit the '-' line when the cluster is empty.

diff --git a/bin/varnishd/common/common_vsmw.c b/bin/varnishd/common/common_vsmw.c
index feb94cff9..9454c4e6a 100644
--- a/bin/varnishd/common/common_vsmw.c
+++ b/bin/varnishd/common/common_vsmw.c
@@ -106,6 +106,7 @@ struct vsmw_cluster {
 	void				*ptr;
 	size_t				next;
 	int				refs;
+	int				named;
 };
 
 struct vsmwseg {
@@ -221,7 +222,7 @@ vsmw_addseg(struct vsmw *vsmw, struct vsmwseg *seg)
 /*--------------------------------------------------------------------*/
 
 static void
-vsmw_delseg(struct vsmw *vsmw, struct vsmwseg *seg, int fixidx)
+vsmw_delseg(struct vsmw *vsmw, struct vsmwseg *seg)
 {
 	char *t = NULL;
 	int fd;
@@ -234,11 +235,10 @@ vsmw_delseg(struct vsmw *vsmw, struct vsmwseg *seg, int fixidx)
 	VTAILQ_REMOVE(&vsmw->segs, seg, list);
 
 	vsmw->nsegs--;
-	if (vsmw->nsubs * 2 < vsmw->nsegs || !fixidx) {
+	if (vsmw->nsubs < 10 || vsmw->nsubs * 2 < vsmw->nsegs) {
 		vsmw_append_record(vsmw, seg, '-');
 		vsmw->nsubs++;
 	} else {
-		vsmw->nsubs = 0;
 		vsmw_mkent(vsmw, vsmw->idx);
 		REPLACE(t, VSB_data(vsmw->vsb));
 		AN(t);
@@ -254,6 +254,7 @@ vsmw_delseg(struct vsmw *vsmw, struct vsmwseg *seg, int fixidx)
 		closefd(&fd);
 		AZ(renameat(vsmw->vdirfd, t, vsmw->vdirfd, vsmw->idx));
 		REPLACE(t, NULL);
+		vsmw->nsubs = 0;
 	}
 	REPLACE(seg->class, NULL);
 	REPLACE(seg->id, NULL);
@@ -315,6 +316,8 @@ VSMW_NewCluster(struct vsmw *vsmw, size_t len, const char *pfx)
 	seg->cluster = vc;
 	REPLACE(seg->class, "");
 	REPLACE(seg->id, "");
+	vc->refs++;
+	vc->named = 1;
 	vsmw_addseg(vsmw, seg);
 
 	vsmw_do_unlock();
@@ -322,28 +325,19 @@ VSMW_NewCluster(struct vsmw *vsmw, size_t len, const char *pfx)
 }
 
 static void
-vsmw_DestroyCluster_locked(struct vsmw *vsmw, struct vsmw_cluster **vsmcp)
+vsmw_DestroyCluster_locked(struct vsmw *vsmw, struct vsmw_cluster *vc)
 {
-	struct vsmw_cluster *vc;
 
 	CHECK_OBJ_NOTNULL(vsmw, VSMW_MAGIC);
-	TAKE_OBJ_NOTNULL(vc, vsmcp, VSMW_CLUSTER_MAGIC);
+	CHECK_OBJ_NOTNULL(vc, VSMW_CLUSTER_MAGIC);
+
+	AZ(vc->refs);
 
-	if (vc->cseg != NULL) {
-		/*
-		 * Backends go on the cool list, so the VGC cluster is
-		 * destroyed before they are.  Solve this by turning the
-		 * cluster into an anonymous cluster which dies with the
-		 * refcount on it.
-		 */
-		vsmw_delseg(vsmw, vc->cseg, 1);
-		vc->cseg = NULL;
-		if (vc->refs > 0)
-			return;
-	}
 	AZ(munmap(vc->ptr, vc->len));
+	if (vc->named)
+		vsmw_delseg(vsmw, vc->cseg);
+	vc->cseg = 0;
 
-	AZ(vc->refs);
 	VTAILQ_REMOVE(&vsmw->clusters, vc, list);
 	if (unlinkat(vsmw->vdirfd, vc->fn, 0))
 		assert (errno == ENOENT);
@@ -354,9 +348,13 @@ vsmw_DestroyCluster_locked(struct vsmw *vsmw, struct vsmw_cluster **vsmcp)
 void
 VSMW_DestroyCluster(struct vsmw *vsmw, struct vsmw_cluster **vsmcp)
 {
+	struct vsmw_cluster *vc;
+
+	TAKE_OBJ_NOTNULL(vc, vsmcp, VSMW_CLUSTER_MAGIC);
 
 	vsmw_do_lock();
-	vsmw_DestroyCluster_locked(vsmw, vsmcp);
+	if (--vc->refs == 0)
+		vsmw_DestroyCluster_locked(vsmw, vc);
 	vsmw_do_unlock();
 }
 
@@ -371,7 +369,6 @@ VSMW_Allocv(struct vsmw *vsmw, struct vsmw_cluster *vc,
 
 	vsmw_do_lock();
 	CHECK_OBJ_NOTNULL(vsmw, VSMW_MAGIC);
-	(void)vc;
 
 	ALLOC_OBJ(seg, VSMWSEG_MAGIC);
 	AN(seg);
@@ -431,11 +428,13 @@ VSMW_Free(struct vsmw *vsmw, void **pp)
 	*pp = NULL;
 
 	cp = seg->cluster;
+	CHECK_OBJ_NOTNULL(cp, VSMW_CLUSTER_MAGIC);
+	assert(cp->refs > 0);
 
-	vsmw_delseg(vsmw, seg, 1);
+	vsmw_delseg(vsmw, seg);
 
-	if (!--cp->refs && cp->cseg == NULL)
-		vsmw_DestroyCluster_locked(vsmw, &cp);
+	if (!--cp->refs)
+		vsmw_DestroyCluster_locked(vsmw, cp);
 	vsmw_do_unlock();
 }
 
@@ -486,7 +485,7 @@ VSMW_Destroy(struct vsmw **pp)
 	vsmw_do_lock();
 	TAKE_OBJ_NOTNULL(vsmw, pp, VSMW_MAGIC);
 	VTAILQ_FOREACH_SAFE(seg, &vsmw->segs, list, s2)
-		vsmw_delseg(vsmw, seg, 0);
+		vsmw_delseg(vsmw, seg);
 	if (unlinkat(vsmw->vdirfd, vsmw->idx, 0))
 		assert (errno == ENOENT);
 	REPLACE(vsmw->idx, NULL);

From phk at FreeBSD.org  Tue Aug 13 11:10:10 2019
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Tue, 13 Aug 2019 11:10:10 +0000 (UTC)
Subject: [master] 29d940014 Never allocate at offset zero in a cluster,
 this makes it faster for clients what the _index entry is about.
Message-ID: <20190813111010.A7568BE579@lists.varnish-cache.org>


commit 29d940014dccab1cb820db1cdf3a907558f5b059
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Aug 13 07:38:51 2019 +0000

    Never allocate at offset zero in a cluster, this makes it faster
    for clients what the _index entry is about.

diff --git a/bin/varnishd/common/common_vsmw.c b/bin/varnishd/common/common_vsmw.c
index 9454c4e6a..ee69eea56 100644
--- a/bin/varnishd/common/common_vsmw.c
+++ b/bin/varnishd/common/common_vsmw.c
@@ -137,6 +137,9 @@ struct vsmw {
 	uint64_t			nsubs;
 };
 
+/* Allocations in clusters never start at offset zero */
+#define VSM_CLUSTER_OFFSET 16
+
 /*--------------------------------------------------------------------*/
 
 static void
@@ -307,7 +310,9 @@ VSMW_NewCluster(struct vsmw *vsmw, size_t len, const char *pfx)
 	struct vsmwseg *seg;
 
 	vsmw_do_lock();
-	vc = vsmw_newcluster(vsmw, len, pfx);
+	vc = vsmw_newcluster(vsmw, len + VSM_CLUSTER_OFFSET, pfx);
+	AN(vc);
+	vc->next += VSM_CLUSTER_OFFSET;
 
 	ALLOC_OBJ(seg, VSMWSEG_MAGIC);
 	AN(seg);

From phk at FreeBSD.org  Tue Aug 13 11:10:10 2019
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Tue, 13 Aug 2019 11:10:10 +0000 (UTC)
Subject: [master] 947147ee6 Polishing/Refactoring
Message-ID: <20190813111010.C0668BE57D@lists.varnish-cache.org>


commit 947147ee65a8b6ea8e6ff1a52810b5604490ee0a
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Aug 13 09:47:10 2019 +0000

    Polishing/Refactoring

diff --git a/lib/libvarnishapi/vsm.c b/lib/libvarnishapi/vsm.c
index 79411d783..13ccf67bb 100644
--- a/lib/libvarnishapi/vsm.c
+++ b/lib/libvarnishapi/vsm.c
@@ -82,6 +82,7 @@ struct vsm_seg {
 #define VSM_FLAG_STALE		(1U<<2)
 #define VSM_FLAG_CLUSTER	(1U<<3)
 	VTAILQ_ENTRY(vsm_seg)	list;
+	VTAILQ_ENTRY(vsm_seg)	clist;
 	struct vsm_set		*set;
 	struct vsm_seg		*cluster;
 	char			**av;
@@ -233,18 +234,26 @@ vsm_unmapseg(struct vsm_seg *vg)
 /*--------------------------------------------------------------------*/
 
 static void
-vsm_delseg(struct vsm_seg *vg)
+vsm_delseg(struct vsm_seg *vg, int refsok)
 {
 
 	CHECK_OBJ_NOTNULL(vg, VSM_SEG_MAGIC);
 
+	if (refsok && vg->refs) {
+		AZ(vg->flags & VSM_FLAG_STALE);
+		vg->flags |= VSM_FLAG_STALE;
+		VTAILQ_REMOVE(&vg->set->segs, vg, list);
+		VTAILQ_INSERT_TAIL(&vg->set->stale, vg, list);
+		return;
+	}
+
 	if (vg->s != NULL)
 		vsm_unmapseg(vg);
 
 	if (vg->flags & VSM_FLAG_STALE)
 		VTAILQ_REMOVE(&vg->set->stale, vg, list);
 	else if (vg->flags & VSM_FLAG_CLUSTER)
-		VTAILQ_REMOVE(&vg->set->clusters, vg, list);
+		VTAILQ_REMOVE(&vg->set->clusters, vg, clist);
 	else
 		VTAILQ_REMOVE(&vg->set->segs, vg, list);
 	VAV_Free(vg->av);
@@ -281,11 +290,11 @@ vsm_delset(struct vsm_set **p)
 	if (vs->dfd >= 0)
 		closefd(&vs->dfd);
 	while (!VTAILQ_EMPTY(&vs->stale))
-		vsm_delseg(VTAILQ_FIRST(&vs->stale));
+		vsm_delseg(VTAILQ_FIRST(&vs->stale), 0);
 	while (!VTAILQ_EMPTY(&vs->segs))
-		vsm_delseg(VTAILQ_FIRST(&vs->segs));
+		vsm_delseg(VTAILQ_FIRST(&vs->segs), 0);
 	while (!VTAILQ_EMPTY(&vs->clusters))
-		vsm_delseg(VTAILQ_FIRST(&vs->clusters));
+		vsm_delseg(VTAILQ_FIRST(&vs->clusters), 0);
 	FREE_OBJ(vs);
 }
 
@@ -295,16 +304,8 @@ vsm_wash_set(struct vsm_set *vs, int all)
 	struct vsm_seg *vg, *vg2;
 
 	VTAILQ_FOREACH_SAFE(vg, &vs->segs, list, vg2) {
-		if (all || (vg->flags & VSM_FLAG_MARKSCAN) == 0) {
-			VTAILQ_REMOVE(&vs->segs, vg, list);
-			if (vg->refs) {
-				vg->flags |= VSM_FLAG_STALE;
-				VTAILQ_INSERT_TAIL(&vs->stale, vg, list);
-			} else {
-				VAV_Free(vg->av);
-				FREE_OBJ(vg);
-			}
-		}
+		if (all || (vg->flags & VSM_FLAG_MARKSCAN) == 0)
+			vsm_delseg(vg, 1);
 	}
 }
 
@@ -441,15 +442,14 @@ vsm_cmp_av(char * const *a1, char * const *a2)
 }
 
 static struct vsm_seg *
-vsm_findcluster(const struct vsm_seg *vga)
+vsm_findcluster(const struct vsm_set *vs, const char *cnam)
 {
-	const struct vsm_set *vs = vga->set;
 	struct vsm_seg *vg;
 	AN(vs);
-	AN(vga->av[1]);
-	VTAILQ_FOREACH(vg, &vs->clusters, list) {
+	AN(cnam);
+	VTAILQ_FOREACH(vg, &vs->clusters, clist) {
 		AN(vg->av[1]);
-		if (!strcmp(vga->av[1], vg->av[1]))
+		if (!strcmp(cnam, vg->av[1]))
 			return (vg);
 	}
 	return (NULL);
@@ -498,7 +498,14 @@ vsm_vlu_plus(struct vsm *vd, struct vsm_set *vs, const char *line)
 		return(-1);
 	}
 
-	if (vs->vg == NULL) {
+	while (vs->vg != NULL && vsm_cmp_av(&vs->vg->av[1], &av[1]))
+		vs->vg = VTAILQ_NEXT(vs->vg, list);
+	if (vs->vg != NULL) {
+		VAV_Free(av);
+		/* entry compared equal, so it survives */
+		vs->vg->flags |= VSM_FLAG_MARKSCAN;
+		vs->vg = VTAILQ_NEXT(vs->vg, list);
+	} else {
 		ALLOC_OBJ(vg2, VSM_SEG_MAGIC);
 		AN(vg2);
 		vg2->av = av;
@@ -507,19 +514,10 @@ vsm_vlu_plus(struct vsm *vd, struct vsm_set *vs, const char *line)
 		vg2->serial = ++vd->serial;
 		if (ac == 4) {
 			vg2->flags |= VSM_FLAG_CLUSTER;
-			VTAILQ_INSERT_TAIL(&vs->clusters, vg2, list);
+			VTAILQ_INSERT_TAIL(&vs->clusters, vg2, clist);
 		} else {
 			VTAILQ_INSERT_TAIL(&vs->segs, vg2, list);
-			vg2->cluster = vsm_findcluster(vg2);
-		}
-	} else {
-		while (vs->vg != NULL && vsm_cmp_av(&vs->vg->av[1], &av[1]))
-			vs->vg = VTAILQ_NEXT(vs->vg, list);
-		VAV_Free(av);
-		if (vs->vg != NULL) {
-			/* entry compared equal, so it survives */
-			vs->vg->flags |= VSM_FLAG_MARKSCAN;
-			vs->vg = VTAILQ_NEXT(vs->vg, list);
+			vg2->cluster = vsm_findcluster(vs, vg2->av[1]);
 		}
 	}
 	return (0);
@@ -530,7 +528,7 @@ vsm_vlu_minus(struct vsm *vd, struct vsm_set *vs, const char *line)
 {
 	char **av;
 	int ac;
-	struct vsm_seg *vg, *vg2;
+	struct vsm_seg *vg;
 
 	av = VAV_Parse(line + 1, &ac, 0);
 
@@ -542,18 +540,11 @@ vsm_vlu_minus(struct vsm *vd, struct vsm_set *vs, const char *line)
 		return(-1);
 	}
 
-	VTAILQ_FOREACH_SAFE(vg, &vs->segs, list, vg2) {
-		if (vsm_cmp_av(&vg->av[1], &av[1]))
-			continue;
-		VTAILQ_REMOVE(&vs->segs, vg, list);
-		if (vg->refs) {
-			vg->flags |= VSM_FLAG_STALE;
-			VTAILQ_INSERT_TAIL(&vs->stale, vg, list);
-		} else {
-			VAV_Free(vg->av);
-			FREE_OBJ(vg);
+	VTAILQ_FOREACH(vg, &vs->segs, list) {
+		if (!vsm_cmp_av(&vg->av[1], &av[1])) {
+			vsm_delseg(vg, 1);
+			break;
 		}
-		break;
 	}
 	VAV_Free(av);
 	return (0);
@@ -925,7 +916,7 @@ VSM_Unmap(struct vsm *vd, struct vsm_fantom *vf)
 		vsm_unmapseg(vg);
 	}
 	if (vg->flags & VSM_FLAG_STALE)
-		vsm_delseg(vg);
+		vsm_delseg(vg, 0);
 	return (0);
 }
 

From phk at FreeBSD.org  Tue Aug 13 11:10:10 2019
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Tue, 13 Aug 2019 11:10:10 +0000 (UTC)
Subject: [master] e8d2ab8fb Try to get the VSM cluster inconsistency fixed for
 good.
Message-ID: <20190813111010.DC85BBE581@lists.varnish-cache.org>


commit e8d2ab8fb2ac89fd4d630c0ed0dfbdc0bc395997
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Aug 13 11:08:18 2019 +0000

    Try to get the VSM cluster inconsistency fixed for good.
    
    Obsoletes:      #3039

diff --git a/bin/varnishtest/tests/c00083.vtc b/bin/varnishtest/tests/c00083.vtc
index 67f52b612..3f79baae2 100644
--- a/bin/varnishtest/tests/c00083.vtc
+++ b/bin/varnishtest/tests/c00083.vtc
@@ -4,15 +4,47 @@ varnish v1 -vcl {
 	backend default { .host = "${bad_ip}"; }
 } -start
 
+delay 1
+
 process p1 {
 	nlines=`wc -l < ${tmpdir}/v1/_.vsm_child/_.index`
 	nminus=`grep -c '^-' ${tmpdir}/v1/_.vsm_child/_.index`
-	echo NLINES $nlines NMINUS $nminus
+	echo CHILD NLINES $nlines NMINUS $nminus
 } -dump -run
 
+# Useful for debugging
+process p2 {tail -F ${tmpdir}/v1/_.vsm_child/_.index} -dump -start
+process p3 {tail -F ${tmpdir}/v1/_.vsm_mgt/_.index} -dump -start
+
+varnish v1 -vcl {
+	backend b00 { .host = "${bad_ip}"; }
+	backend b01 { .host = "${bad_ip}"; }
+	backend b02 { .host = "${bad_ip}"; }
+	backend b03 { .host = "${bad_ip}"; }
+
+	sub vcl_recv {
+		set req.backend_hint = b00;
+		set req.backend_hint = b01;
+		set req.backend_hint = b02;
+		set req.backend_hint = b03;
+	}
+}
+
+varnish v1 -cliok vcl.list
+
+process p1 -run
+
+varnish v1 -cliok "vcl.use vcl1"
+varnish v1 -cliok "vcl.discard vcl2"
+
+delay 1
+
+process p1 -run
+
 # The child process starts out with approx 37 VSM segments
-# so it takes 20 backends to cause a _.index rewrite.
-# Make it 25 to be safe.
+# and spent 10 lines on vcl2, so it takes ~ 15 backends to
+# cause a _.index rewrite.
+# Make it 20 to be on the safe side.
 varnish v1 -vcl {
 	backend b00 { .host = "${bad_ip}"; }
 	backend b01 { .host = "${bad_ip}"; }
@@ -34,11 +66,6 @@ varnish v1 -vcl {
 	backend b17 { .host = "${bad_ip}"; }
 	backend b18 { .host = "${bad_ip}"; }
 	backend b19 { .host = "${bad_ip}"; }
-	backend b20 { .host = "${bad_ip}"; }
-	backend b21 { .host = "${bad_ip}"; }
-	backend b22 { .host = "${bad_ip}"; }
-	backend b23 { .host = "${bad_ip}"; }
-	backend b24 { .host = "${bad_ip}"; }
 
 	sub vcl_recv {
 		set req.backend_hint = b00;
@@ -61,25 +88,54 @@ varnish v1 -vcl {
 		set req.backend_hint = b17;
 		set req.backend_hint = b18;
 		set req.backend_hint = b19;
-		set req.backend_hint = b20;
-		set req.backend_hint = b21;
-		set req.backend_hint = b22;
-		set req.backend_hint = b23;
-		set req.backend_hint = b24;
 	}
 }
 
 varnish v1 -cliok vcl.list
 
+delay 1
+
 process p1 -run
 
 varnish v1 -cliok "vcl.use vcl1"
-varnish v1 -cliok "vcl.discard vcl2"
+varnish v1 -cliok "vcl.discard vcl3"
+
+delay 1
 
 # Check that the _.index rewrite did happen
+
 process p1 {
 	nlines=`wc -l < ${tmpdir}/v1/_.vsm_child/_.index`
 	nminus=`grep -c '^-' ${tmpdir}/v1/_.vsm_child/_.index`
-	echo NLINES $nlines NMINUS $nminus
-	test $nminus -lt 25
+	echo CHILD NLINES $nlines NMINUS $nminus
+	# cat ${tmpdir}/v1/_.vsm_child/_.index
+	test $nminus -lt 20
 } -run
+
+# Now check the management process VSM
+
+process p1 {
+	nlines=`wc -l < ${tmpdir}/v1/_.vsm_mgt/_.index`
+	nminus=`grep -c '^-' ${tmpdir}/v1/_.vsm_mgt/_.index`
+	echo MGT NLINES $nlines NMINUS $nminus
+	# cat ${tmpdir}/v1/_.vsm_child/_.index
+	test $nminus -eq 0
+} -run
+
+varnish v1 -cliok "stop"
+
+delay 1
+
+process p1 {
+	nlines=`wc -l < ${tmpdir}/v1/_.vsm_mgt/_.index`
+	nminus=`grep -c '^-' ${tmpdir}/v1/_.vsm_mgt/_.index`
+	echo MGT NLINES $nlines NMINUS $nminus
+	# cat ${tmpdir}/v1/_.vsm_child/_.index
+	test $nminus -eq 2
+} -run
+
+varnish v1 -cliok "start"
+
+delay 1
+
+process p1 -run
diff --git a/bin/varnishtop/varnishtop.c b/bin/varnishtop/varnishtop.c
index 1fc844f27..3bfb9ec56 100644
--- a/bin/varnishtop/varnishtop.c
+++ b/bin/varnishtop/varnishtop.c
@@ -353,6 +353,7 @@ main(int argc, char **argv)
 		ident = VSM_Dup(vut->vsm, "Arg", "-i");
 	else
 		ident = strdup("");
+	AN(ident);
 	vut->dispatch_f = accumulate;
 	vut->dispatch_priv = NULL;
 	if (once) {
diff --git a/lib/libvarnishapi/vsc.c b/lib/libvarnishapi/vsc.c
index e0194e8c9..8725124a7 100644
--- a/lib/libvarnishapi/vsc.c
+++ b/lib/libvarnishapi/vsc.c
@@ -423,6 +423,7 @@ VSC_Iter(struct vsc *vsc, struct vsm *vsm, VSC_iter_f *fiter, void *priv)
 	AN(vsm);
 	sp = VTAILQ_FIRST(&vsc->segs);
 	VSM_FOREACH(&ifantom, vsm) {
+		AN(ifantom.class);
 		if (strcmp(ifantom.class, VSC_CLASS) &&
 		    strcmp(ifantom.class, VSC_DOC_CLASS))
 			continue;
diff --git a/lib/libvarnishapi/vsm.c b/lib/libvarnishapi/vsm.c
index 13ccf67bb..270d601b2 100644
--- a/lib/libvarnishapi/vsm.c
+++ b/lib/libvarnishapi/vsm.c
@@ -239,6 +239,11 @@ vsm_delseg(struct vsm_seg *vg, int refsok)
 
 	CHECK_OBJ_NOTNULL(vg, VSM_SEG_MAGIC);
 
+	if (vg->flags & VSM_FLAG_CLUSTER) {
+		vg->flags &= ~VSM_FLAG_CLUSTER;
+		VTAILQ_REMOVE(&vg->set->clusters, vg, clist);
+	}
+
 	if (refsok && vg->refs) {
 		AZ(vg->flags & VSM_FLAG_STALE);
 		vg->flags |= VSM_FLAG_STALE;
@@ -252,8 +257,6 @@ vsm_delseg(struct vsm_seg *vg, int refsok)
 
 	if (vg->flags & VSM_FLAG_STALE)
 		VTAILQ_REMOVE(&vg->set->stale, vg, list);
-	else if (vg->flags & VSM_FLAG_CLUSTER)
-		VTAILQ_REMOVE(&vg->set->clusters, vg, clist);
 	else
 		VTAILQ_REMOVE(&vg->set->segs, vg, list);
 	VAV_Free(vg->av);
@@ -293,13 +296,12 @@ vsm_delset(struct vsm_set **p)
 		vsm_delseg(VTAILQ_FIRST(&vs->stale), 0);
 	while (!VTAILQ_EMPTY(&vs->segs))
 		vsm_delseg(VTAILQ_FIRST(&vs->segs), 0);
-	while (!VTAILQ_EMPTY(&vs->clusters))
-		vsm_delseg(VTAILQ_FIRST(&vs->clusters), 0);
+	assert(VTAILQ_EMPTY(&vs->clusters));
 	FREE_OBJ(vs);
 }
 
 static void
-vsm_wash_set(struct vsm_set *vs, int all)
+vsm_wash_set(const struct vsm_set *vs, int all)
 {
 	struct vsm_seg *vg, *vg2;
 
@@ -486,13 +488,12 @@ vsm_vlu_plus(struct vsm *vd, struct vsm_set *vs, const char *line)
 {
 	char **av;
 	int ac;
-	struct vsm_seg *vg2;
+	struct vsm_seg *vg;
 
 	av = VAV_Parse(line + 1, &ac, 0);
 
 	if (av[0] != NULL || ac < 4 || ac > 6) {
-		(void)(vsm_diag(vd,
-		    "vsm_vlu_plus: bad index (%d/%s)",
+		(void)(vsm_diag(vd, "vsm_vlu_plus: bad index (%d/%s)",
 		    ac, av[0]));
 		VAV_Free(av);
 		return(-1);
@@ -506,25 +507,26 @@ vsm_vlu_plus(struct vsm *vd, struct vsm_set *vs, const char *line)
 		vs->vg->flags |= VSM_FLAG_MARKSCAN;
 		vs->vg = VTAILQ_NEXT(vs->vg, list);
 	} else {
-		ALLOC_OBJ(vg2, VSM_SEG_MAGIC);
-		AN(vg2);
-		vg2->av = av;
-		vg2->set = vs;
-		vg2->flags = VSM_FLAG_MARKSCAN;
-		vg2->serial = ++vd->serial;
+		ALLOC_OBJ(vg, VSM_SEG_MAGIC);
+		AN(vg);
+		vg->av = av;
+		vg->set = vs;
+		vg->flags = VSM_FLAG_MARKSCAN;
+		vg->serial = ++vd->serial;
+		VTAILQ_INSERT_TAIL(&vs->segs, vg, list);
 		if (ac == 4) {
-			vg2->flags |= VSM_FLAG_CLUSTER;
-			VTAILQ_INSERT_TAIL(&vs->clusters, vg2, clist);
-		} else {
-			VTAILQ_INSERT_TAIL(&vs->segs, vg2, list);
-			vg2->cluster = vsm_findcluster(vs, vg2->av[1]);
+			vg->flags |= VSM_FLAG_CLUSTER;
+			VTAILQ_INSERT_TAIL(&vs->clusters, vg, clist);
+		} else if (*vg->av[2] != '0') {
+			vg->cluster = vsm_findcluster(vs, vg->av[1]);
+			AN(vg->cluster);
 		}
 	}
 	return (0);
 }
 
 static int
-vsm_vlu_minus(struct vsm *vd, struct vsm_set *vs, const char *line)
+vsm_vlu_minus(struct vsm *vd, const struct vsm_set *vs, const char *line)
 {
 	char **av;
 	int ac;
@@ -533,19 +535,25 @@ vsm_vlu_minus(struct vsm *vd, struct vsm_set *vs, const char *line)
 	av = VAV_Parse(line + 1, &ac, 0);
 
 	if (av[0] != NULL || ac < 4 || ac > 6) {
-		(void)(vsm_diag(vd,
-		    "vsm_vlu_minus: bad index (%d/%s)",
+		(void)(vsm_diag(vd, "vsm_vlu_minus: bad index (%d/%s)",
 		    ac, av[0]));
 		VAV_Free(av);
 		return(-1);
 	}
 
-	VTAILQ_FOREACH(vg, &vs->segs, list) {
+	/* Clustered segments cannot come before their cluster */
+	if (*av[2] != '0')
+		vg = vsm_findcluster(vs, av[1]);
+	else
+		vg = VTAILQ_FIRST(&vs->segs);
+
+	for (;vg != NULL; vg = VTAILQ_NEXT(vg, list)) {
 		if (!vsm_cmp_av(&vg->av[1], &av[1])) {
 			vsm_delseg(vg, 1);
 			break;
 		}
 	}
+	AN(vg);
 	VAV_Free(av);
 	return (0);
 }
@@ -788,28 +796,36 @@ VSM__iter0(const struct vsm *vd, struct vsm_fantom *vf)
 int
 VSM__itern(struct vsm *vd, struct vsm_fantom *vf)
 {
-	struct vsm_seg *vg, *vg2;
+	struct vsm_seg *vg;
 
 	CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);
 	AN(vd->attached);
 	AN(vf);
 
 	if (vf->priv == 0) {
-		vg2 = VTAILQ_FIRST(&vd->mgt->segs);
+		vg = VTAILQ_FIRST(&vd->mgt->segs);
+		if (vg == NULL)
+			return (0);
 	} else {
 		vg = vsm_findseg(vd, vf);
 		if (vg == NULL)
 			return (vsm_diag(vd, "VSM_FOREACH: inconsistency"));
-		vg2 = VTAILQ_NEXT(vg, list);
-		if (vg2 == NULL && vg->set == vd->mgt)
-			vg2 = VTAILQ_FIRST(&vd->child->segs);
+		while (1) {
+			if (vg->set == vd->mgt && VTAILQ_NEXT(vg, list) == NULL)
+				vg = VTAILQ_FIRST(&vd->child->segs);
+			else
+				vg = VTAILQ_NEXT(vg, list);
+			if (vg == NULL)
+				return (0);
+			if (!(vg->flags & VSM_FLAG_CLUSTER))
+				break;
+		}
 	}
-	if (vg2 == NULL)
-		return (0);
 	memset(vf, 0, sizeof *vf);
-	vf->priv = vg2->serial;
-	vf->class = vg2->av[4];
-	vf->ident = vg2->av[5];
+	vf->priv = vg->serial;
+	vf->class = vg->av[4];
+	vf->ident = vg->av[5];
+	AN(vf->class);
 	return (1);
 }
 

From phk at FreeBSD.org  Tue Aug 13 11:38:06 2019
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Tue, 13 Aug 2019 11:38:06 +0000 (UTC)
Subject: [master] 34b01c480 Comment out 'tail -F', SunOS does not support it.
Message-ID: <20190813113806.D34F4BF7C0@lists.varnish-cache.org>


commit 34b01c480c5299e99798b34147a91d33ee3e171e
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Aug 13 11:36:44 2019 +0000

    Comment out 'tail -F', SunOS does not support it.

diff --git a/bin/varnishtest/tests/c00083.vtc b/bin/varnishtest/tests/c00083.vtc
index 3f79baae2..6b5ff7e69 100644
--- a/bin/varnishtest/tests/c00083.vtc
+++ b/bin/varnishtest/tests/c00083.vtc
@@ -13,8 +13,8 @@ process p1 {
 } -dump -run
 
 # Useful for debugging
-process p2 {tail -F ${tmpdir}/v1/_.vsm_child/_.index} -dump -start
-process p3 {tail -F ${tmpdir}/v1/_.vsm_mgt/_.index} -dump -start
+#process p2 {tail -F ${tmpdir}/v1/_.vsm_child/_.index} -dump -start
+#process p3 {tail -F ${tmpdir}/v1/_.vsm_mgt/_.index} -dump -start
 
 varnish v1 -vcl {
 	backend b00 { .host = "${bad_ip}"; }

From phk at FreeBSD.org  Tue Aug 13 13:11:06 2019
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Tue, 13 Aug 2019 13:11:06 +0000 (UTC)
Subject: [master] 666d8427d Don't close the _.index fd,
 but continue reading until the file is recreated by varnishd.
Message-ID: <20190813131106.32A2F5986@lists.varnish-cache.org>


commit 666d8427d206e45d0b16d308f21f052aeb61f897
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Aug 13 13:09:14 2019 +0000

    Don't close the _.index fd, but continue reading until the
    file is recreated by varnishd.
    
    Martin spotted that I lost this in the previous commit.

diff --git a/lib/libvarnishapi/vsm.c b/lib/libvarnishapi/vsm.c
index 270d601b2..53ceb387b 100644
--- a/lib/libvarnishapi/vsm.c
+++ b/lib/libvarnishapi/vsm.c
@@ -70,6 +70,8 @@
 const struct vsm_valid VSM_invalid[1] = {{"invalid"}};
 const struct vsm_valid VSM_valid[1] = {{"valid"}};
 
+static vlu_f vsm_vlu_func;
+
 /*--------------------------------------------------------------------*/
 
 struct vsm_set;
@@ -112,6 +114,7 @@ struct vsm_set {
 	uintmax_t		id1, id2;
 
 	// _.index reading state
+	struct vlu		*vlu;
 	unsigned		retval;
 	struct vsm_seg		*vg;
 
@@ -277,6 +280,8 @@ vsm_newset(const char *dirname)
 	VTAILQ_INIT(&vs->clusters);
 	vs->dname = dirname;
 	vs->dfd = vs->fd = -1;
+	vs->vlu = VLU_New(vsm_vlu_func, vs, 0);
+	AN(vs->vlu);
 	return (vs);
 }
 
@@ -297,6 +302,7 @@ vsm_delset(struct vsm_set **p)
 	while (!VTAILQ_EMPTY(&vs->segs))
 		vsm_delseg(VTAILQ_FIRST(&vs->segs), 0);
 	assert(VTAILQ_EMPTY(&vs->clusters));
+	VLU_Destroy(&vs->vlu);
 	FREE_OBJ(vs);
 }
 
@@ -590,76 +596,79 @@ vsm_vlu_func(void *priv, const char *line)
 	return (i);
 }
 
+static void
+vsm_readlines(struct vsm_set *vs)
+{
+	int i;
+
+	do {
+		i = VLU_Fd(vs->vlu, vs->fd);
+	} while (!i);
+	assert(i == -2);
+}
+
 static unsigned
 vsm_refresh_set(struct vsm *vd, struct vsm_set *vs)
 {
 	struct stat st;
-	int i;
-	struct vlu *vlu;
 
 	CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);
 	CHECK_OBJ_NOTNULL(vs, VSM_SET_MAGIC);
 	vs->retval = 0;
-	if (vs->dfd >= 0) {
-		if (fstatat(vd->wdfd, vs->dname, &st, AT_SYMLINK_NOFOLLOW) ||
-		    st.st_ino != vs->dst.st_ino ||
-		    st.st_dev != vs->dst.st_dev ||
-		    st.st_mode != vs->dst.st_mode ||
-		    st.st_nlink == 0) {
-			closefd(&vs->dfd);
-			vs->id1 = vs->id2 = 0;
-			vsm_wash_set(vs, 1);
-			vs->retval |= vs->flag_restarted;
-		}
+	if (vs->dfd >= 0 && (
+	    fstatat(vd->wdfd, vs->dname, &st, AT_SYMLINK_NOFOLLOW) ||
+	    st.st_ino != vs->dst.st_ino ||
+	    st.st_dev != vs->dst.st_dev ||
+	    st.st_mode != vs->dst.st_mode ||
+	    st.st_nlink == 0)) {
+		closefd(&vs->dfd);
 	}
 
 	if (vs->dfd < 0) {
 		if (vs->fd >= 0)
 			closefd(&vs->fd);
 		vs->dfd = openat(vd->wdfd, vs->dname, O_RDONLY);
-		if (vs->dfd < 0) {
-			vs->id1 = vs->id2 = 0;
-			vsm_wash_set(vs, 1);
-			vs->retval |= vs->flag_restarted;
-			return (vs->retval);
-		}
-		AZ(fstat(vs->dfd, &vs->dst));
 	}
 
+	if (vs->dfd < 0) {
+		vs->id1 = vs->id2 = 0;
+		vsm_wash_set(vs, 1);
+		return (vs->retval | vs->flag_restarted);
+	}
+
+	AZ(fstat(vs->dfd, &vs->dst));
+
 	if (vs->fd >= 0 && (
 	    fstatat(vs->dfd, "_.index", &st, AT_SYMLINK_NOFOLLOW) ||
 	    st.st_ino != vs->fst.st_ino ||
 	    st.st_dev != vs->fst.st_dev ||
 	    st.st_mode != vs->fst.st_mode ||
-	    st.st_size != vs->fst.st_size ||
+	    st.st_size < vs->fst.st_size ||
 	    st.st_nlink < 1 ||
 	    memcmp(&st.st_mtime, &vs->fst.st_mtime, sizeof st.st_mtime))) {
 		closefd(&vs->fd);
 	}
 
 	if (vs->fd >= 0) {
-		if (vd->couldkill < 1 || !kill(vs->id1, 0))
-			vs->retval |= vs->flag_running;
-		return (vs->retval);
+		vs->vg = NULL;
+		vsm_readlines(vs);
+	} else {
+		VTAILQ_FOREACH(vs->vg, &vs->segs, list)
+			vs->vg->flags &= ~VSM_FLAG_MARKSCAN;
+		vs->vg = VTAILQ_FIRST(&vs->segs);
+		vs->fd = openat(vs->dfd, "_.index", O_RDONLY);
+		if (vs->fd < 0)
+			return (vs->retval|vs->flag_restarted);
+		VLU_Reset(vs->vlu);
+		AZ(fstat(vs->fd, &vs->fst));
+		vsm_readlines(vs);
+		vsm_wash_set(vs, 0);
 	}
 
-	vs->retval |= vs->flag_changed;
-	vs->fd = openat(vs->dfd, "_.index", O_RDONLY);
-	if (vs->fd < 0)
-		return (vs->retval|vs->flag_restarted);
-
-	AZ(fstat(vs->fd, &vs->fst));
-
-	vlu = VLU_New(vsm_vlu_func, vs, 0);
-	AN(vlu);
+	vs->fst.st_size = lseek(vs->fd, 0L, SEEK_CUR);
 
-	vs->vg = NULL;
-	do {
-		i = VLU_Fd(vlu, vs->fd);
-	} while (!i);
-	assert(i == -2);
-	VLU_Destroy(&vlu);
-	vsm_wash_set(vs, 0);
+	if (vd->couldkill < 1 || !kill(vs->id1, 0))
+		vs->retval |= vs->flag_running;
 	return (vs->retval);
 }
 

From phk at FreeBSD.org  Wed Aug 14 07:41:07 2019
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Wed, 14 Aug 2019 07:41:07 +0000 (UTC)
Subject: [master] 82ad74ad2 move backend error state reason and code struct
 field to end of struct
Message-ID: <20190814074107.9BEB9A4A5B@lists.varnish-cache.org>


commit 82ad74ad29504481267c3e986b6b8e5465c389a3
Author: Andrew Wiik <andrew at varnish-software.com>
Date:   Mon Aug 12 13:05:07 2019 -0400

    move backend error state reason and code struct field to end of struct

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index a204200c1..778db6861 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -412,9 +412,6 @@ struct busyobj {
 
 	struct http_conn	*htc;
 
-	uint16_t		err_code;
-	const char		*err_reason;
-
 	struct pool_task	fetch_task;
 
 #define BO_FLAG(l, r, w, d) unsigned	l:1;
@@ -442,6 +439,9 @@ struct busyobj {
 
 	uint8_t			digest[DIGEST_LEN];
 	struct vrt_privs	privs[1];
+
+	uint16_t		err_code;
+	const char		*err_reason;
 };
 
 

From phk at FreeBSD.org  Wed Aug 14 08:27:06 2019
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Wed, 14 Aug 2019 08:27:06 +0000 (UTC)
Subject: [master] 67ea0c83c Distinguish $TYPE.property from $TYPE.method() by
 insisting in ()
Message-ID: <20190814082706.3573AA5ADF@lists.varnish-cache.org>


commit 67ea0c83c3eb7df9e971fa8011cc0cbe2814ca57
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Aug 14 08:25:50 2019 +0000

    Distinguish $TYPE.property from $TYPE.method() by insisting in ()
    
    STRING.upper() and STRING.lower() are methods.
    
    Relevant to: #3023

diff --git a/bin/varnishtest/tests/v00058.vtc b/bin/varnishtest/tests/v00058.vtc
index c7f39e628..76fec5ec6 100644
--- a/bin/varnishtest/tests/v00058.vtc
+++ b/bin/varnishtest/tests/v00058.vtc
@@ -184,14 +184,14 @@ server s1 {
 
 varnish v1 -vcl+backend {
 	sub vcl_deliver {
-		set resp.http.l-proto = resp.proto.lower;
-		set resp.http.u-proto = resp.proto.upper;
-		set resp.http.l-req = req.url.lower;
-		set resp.http.u-req = req.url.upper;
-		set resp.http.l-mod = (req.url + "bar").lower;
-		set resp.http.u-mod = (req.url + "bar").upper;
-		set resp.http.uu-mod = (req.url + "bar").upper.upper;
-		set resp.http.ul-mod = (req.url + "bar").upper.lower;
+		set resp.http.l-proto = resp.proto.lower();
+		set resp.http.u-proto = resp.proto.upper();
+		set resp.http.l-req = req.url.lower();
+		set resp.http.u-req = req.url.upper();
+		set resp.http.l-mod = (req.url + "bar").lower();
+		set resp.http.u-mod = (req.url + "bar").upper();
+		set resp.http.uu-mod = (req.url + "bar").upper().upper();
+		set resp.http.ul-mod = (req.url + "bar").upper().lower();
 	}
 }
 
diff --git a/lib/libvcc/vcc_expr.c b/lib/libvcc/vcc_expr.c
index 054b2ef56..29d82a23d 100644
--- a/lib/libvcc/vcc_expr.c
+++ b/lib/libvcc/vcc_expr.c
@@ -803,7 +803,13 @@ vcc_expr5(struct vcc *tl, struct expr **e, vcc_type_t fmt)
 /*--------------------------------------------------------------------
  * SYNTAX:
  *    Expr4:
- *      Expr5 [ '.' type_method() ]*
+ *      Expr5 [ '.' (type_attribute | type_method()) ]*
+ *
+ * type_attributes is information already existing, requiring no
+ * processing or resource usage.
+ *
+ * type_methods are calls and may do (significant processing, change things,
+ * eat workspace etc.
  */
 
 static const struct vcc_methods {
@@ -811,15 +817,16 @@ static const struct vcc_methods {
 	vcc_type_t		type_to;
 	const char		*method;
 	const char		*impl;
+	int			func;
 } vcc_methods[] = {
 	//{ BACKEND, BOOL,	"healthy",	"VRT_Healthy(ctx, \v1, 0)" },
 
 #define VRTSTVVAR(nm, vtype, ctype, dval) \
-	{ STEVEDORE, vtype, #nm, "VRT_stevedore_" #nm "(\v1)"},
+	{ STEVEDORE, vtype, #nm, "VRT_stevedore_" #nm "(\v1)", 0},
 #include "tbl/vrt_stv_var.h"
 
-	{ STRINGS, STRING, "upper", "VRT_UpperLowerStrands(ctx, \vT, 1)" },
-	{ STRINGS, STRING, "lower", "VRT_UpperLowerStrands(ctx, \vT, 0)" },
+	{ STRINGS, STRING, "upper", "VRT_UpperLowerStrands(ctx, \vT, 1)", 1 },
+	{ STRINGS, STRING, "lower", "VRT_UpperLowerStrands(ctx, \vT, 0)", 1 },
 
 	{ NULL, NULL,		NULL,		NULL},
 };
@@ -859,6 +866,12 @@ vcc_expr4(struct vcc *tl, struct expr **e, vcc_type_t fmt)
 			(*e)->fmt = STRINGS;
 			(*e)->nstr = 1;
 		}
+		if (vm->func) {
+			ExpectErr(tl, '(');
+			vcc_NextToken(tl);
+			ExpectErr(tl, ')');
+			vcc_NextToken(tl);
+		}
 	}
 }
 

From phk at FreeBSD.org  Wed Aug 14 08:47:06 2019
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Wed, 14 Aug 2019 08:47:06 +0000 (UTC)
Subject: [master] d9ccdb7c6 Doc-fixino for vcl.label
Message-ID: <20190814084706.75FBDA638E@lists.varnish-cache.org>


commit d9ccdb7c628c6292c6c58cd1aed57a1e90e2f81d
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Aug 14 08:45:51 2019 +0000

    Doc-fixino for vcl.label

diff --git a/bin/varnishd/mgt/mgt_cli.c b/bin/varnishd/mgt/mgt_cli.c
index 2798eceb6..403ef54f2 100644
--- a/bin/varnishd/mgt/mgt_cli.c
+++ b/bin/varnishd/mgt/mgt_cli.c
@@ -690,6 +690,7 @@ void
 mgt_DumpRstCli(void)
 {
 	const struct cli_cmd_desc *cp;
+	const char *p;
 	int i, j;
 
 	qsort(cmds, ncmds, sizeof cmds[0], cli_cmp);
@@ -697,7 +698,10 @@ mgt_DumpRstCli(void)
 		cp = cmds[i];
 		if (!strncmp(cp->request, "debug.", 6))
 			continue;
-		printf(".. _ref_cli_%s:\n\n", cp->syntax);
+		printf(".. _ref_cli_");
+		for (p = cp->request; *p; p++)
+			putchar(*p == '.' ? '_' : *p);
+		printf(":\n\n");
 		printf("%s\n", cp->syntax);
 		for (j = 0; j < strlen(cp->syntax); j++)
 			printf("~");
diff --git a/doc/sphinx/users-guide/vcl-built-in-subs.rst b/doc/sphinx/users-guide/vcl-built-in-subs.rst
index 94f62c9da..810ffedad 100644
--- a/doc/sphinx/users-guide/vcl-built-in-subs.rst
+++ b/doc/sphinx/users-guide/vcl-built-in-subs.rst
@@ -110,7 +110,7 @@ of the following keywords:
     Switch to vcl labelled *label*. This will continue vcl processing
     in this vcl's :ref:`vcl_recv` as if it was the active vcl.
 
-    See the :ref:`varnishadm(1)` ``vcl.label`` command.
+    See the :ref:`ref_cli_vcl_label` command.
 
 .. _vcl_pipe:
 
@@ -537,8 +537,8 @@ with one of the following keywords:
     :ref:`vcl_synth` on the client side is called with ``resp.status``
     preset to 503.
 
-vcl.load / vcl.discard
-----------------------
+During vcl.load / vcl.discard
+-----------------------------
 
 .. _vcl_init:
 
diff --git a/include/tbl/cli_cmds.h b/include/tbl/cli_cmds.h
index d1b9f2afa..3493736c0 100644
--- a/include/tbl/cli_cmds.h
+++ b/include/tbl/cli_cmds.h
@@ -141,7 +141,9 @@ CLI_CMD(VCL_LABEL,
 	"vcl.label",
 	"vcl.label <label> <configname>",
 	"Apply label to configuration.",
-	"",
+	"A VCL label is like a UNIX symbolic link, "
+	"a name without substance, which points to another VCL.\n\n"
+	"Labels are mandatory whenever one VCL references another.",
 	2, 2
 )
 

From phk at FreeBSD.org  Wed Aug 14 08:53:05 2019
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Wed, 14 Aug 2019 08:53:05 +0000 (UTC)
Subject: [master] f4dcf8f02 EPROTO can happen on solar-ish OSes
Message-ID: <20190814085305.46382A66BF@lists.varnish-cache.org>


commit f4dcf8f02a2fb059dacba4c7bedefccbe9897cd2
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Wed Aug 14 09:17:16 2019 +0200

    EPROTO can happen on solar-ish OSes
    
    I have checked the illumos source and there are some legit conditions
    when EPROTO is signalled for misbehaving tcp peers.
    
    panic seen in production:
    
    Assert error in VTCP_blocking(), vtcp.c line 225:
      Condition(VTCP_Check(j)) not true.
    version = varnish-trunk revision 3457ded, vrt api = 6.1
    ident = -jsolaris,-smalloc,-smalloc,-hcritbit,ports
    now = 39647514.473957 (mono), 1564367221.322315 (real)
    Backtrace:
      4630c2: /usr/local/sbin/varnishd'pan_backtrace+0x30 [0x4630c2]
      463535: /usr/local/sbin/varnishd'pan_ic+0x23a [0x463535]
      4cefcb: /usr/local/sbin/varnishd'VTCP_blocking+0x5e [0x4cefcb]
      48e789: /usr/local/sbin/varnishd'HTTP1_Session+0x150 [0x48e789]
      48d6bd: /usr/local/sbin/varnishd'http1_req+0x12a [0x48d6bd]
      482cbd: /usr/local/sbin/varnishd'Pool_Work_Thread+0x4e4 [0x482cbd]
      481d4c: /usr/local/sbin/varnishd'WRK_Thread+0x2bf [0x481d4c]
      482de4: /usr/local/sbin/varnishd'pool_thread+0x96 [0x482de4]
      fffffc7fef23e1ea: /lib/amd64/libc.so.1'_thrp_setup+0x8a [0xfffffc7fef23e1ea]
      fffffc7fef23e500: /lib/amd64/libc.so.1'_lwp_start+0x0 [0xfffffc7fef23e500]
    errno = 71 (Protocol error)

diff --git a/lib/libvarnish/vtcp.c b/lib/libvarnish/vtcp.c
index bc4d88ee5..625438ab1 100644
--- a/lib/libvarnish/vtcp.c
+++ b/lib/libvarnish/vtcp.c
@@ -562,6 +562,10 @@ VTCP_Check(int a)
 		return (1);
 	if (errno == ECONNRESET || errno == ENOTCONN || errno == EPIPE)
 		return (1);
+#if (defined (__SVR4) && defined (__sun))
+	if (errno == EPROTO)
+		return (1);
+#endif
 #if (defined (__SVR4) && defined (__sun)) || defined (__NetBSD__)
 	/*
 	 * Solaris returns EINVAL if the other end unexpectedly reset the

From phk at FreeBSD.org  Mon Aug 19 11:16:06 2019
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Mon, 19 Aug 2019 11:16:06 +0000 (UTC)
Subject: [master] 5375a6cfb Add show ESI option(-e)
Message-ID: <20190819111606.EA1EC104185@lists.varnish-cache.org>


commit 5375a6cfb1741c9f2da6f936992b75f315924a4e
Author: Shohei Tanaka(@xcir) <kokoniimasu+git at gmail.com>
Date:   Wed Aug 14 21:25:04 2019 +0900

    Add show ESI option(-e)

diff --git a/bin/varnishncsa/varnishncsa.c b/bin/varnishncsa/varnishncsa.c
index c17548809..ff554d23e 100644
--- a/bin/varnishncsa/varnishncsa.c
+++ b/bin/varnishncsa/varnishncsa.c
@@ -140,6 +140,7 @@ static struct ctx {
 	int			a_opt;
 	int			b_opt;
 	int			c_opt;
+	int			e_opt;
 	char			*w_arg;
 
 	FILE			*fo;
@@ -891,7 +892,7 @@ dispatch_f(struct VSL_data *vsl, struct VSL_transaction * const pt[],
 			be_mark = BACKEND_MARKER;
 		} else
 			continue;
-		if (t->reason == VSL_r_esi)
+		if (t->reason == VSL_r_esi && !CTX.e_opt)
 			/* Skip ESI requests */
 			continue;
 		CTX.hitmiss = "-";
@@ -1111,6 +1112,10 @@ main(int argc, char * const *argv)
 			/* client mode */
 			CTX.c_opt = 1;
 			break;
+		case 'e':
+			/* show ESI */
+			CTX.e_opt = 1;
+			break;
 		case 'F':
 			if (format != NULL)
 				VUT_Error(vut, 1, "Format already set");
diff --git a/bin/varnishncsa/varnishncsa_options.h b/bin/varnishncsa/varnishncsa_options.h
index 8987a9615..b372647bc 100644
--- a/bin/varnishncsa/varnishncsa_options.h
+++ b/bin/varnishncsa/varnishncsa_options.h
@@ -72,10 +72,15 @@
 	    "Log client requests. This is the default. If -b is"	\
 	    " specified, then -c is needed to also log client requests"	\
 	)
+#define NCSA_OPT_e							\
+	VOPT("e", "[-e]", "Show ESI request",				\
+	    "Show ESI request."	\
+	)
 
 NCSA_OPT_a
 NCSA_OPT_b
 NCSA_OPT_c
+NCSA_OPT_e
 VSL_OPT_C
 VUT_OPT_d
 VUT_GLOBAL_OPT_D
diff --git a/bin/varnishtest/tests/e00033.vtc b/bin/varnishtest/tests/e00033.vtc
new file mode 100644
index 000000000..73246abc3
--- /dev/null
+++ b/bin/varnishtest/tests/e00033.vtc
@@ -0,0 +1,32 @@
+varnishtest "varnishncsa show ESI request"
+
+server s1 {
+	rxreq
+	txresp -body {
+		<html>
+		Before include
+		<esi:include src="/esi"/>
+		After include
+		</html>
+	}
+	rxreq
+	txresp -body {
+		Included file
+	}
+} -start
+
+varnish v1 -vcl+backend {
+	sub vcl_backend_response {
+		set beresp.do_esi = true;
+	}
+} -start
+
+
+client c1 {
+	txreq
+	rxresp
+} -run
+
+shell -match "^0$" "varnishncsa -n ${v1_name}  -d  -q \"requrl ~ '/esi'\"    | wc -l"
+shell -match "^1$" "varnishncsa -n ${v1_name}  -d  -q \"requrl ~ '/esi'\" -e | wc -l"
+

From phk at FreeBSD.org  Mon Aug 19 11:18:07 2019
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Mon, 19 Aug 2019 11:18:07 +0000 (UTC)
Subject: [master] d8c5ada6c Move to -E option for ESI output.
Message-ID: <20190819111807.58733104383@lists.varnish-cache.org>


commit d8c5ada6c90db32e39f016c98290c4ed6ef968fe
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Aug 19 11:17:04 2019 +0000

    Move to -E option for ESI output.

diff --git a/bin/varnishncsa/varnishncsa.c b/bin/varnishncsa/varnishncsa.c
index ff554d23e..0dc640237 100644
--- a/bin/varnishncsa/varnishncsa.c
+++ b/bin/varnishncsa/varnishncsa.c
@@ -140,7 +140,7 @@ static struct ctx {
 	int			a_opt;
 	int			b_opt;
 	int			c_opt;
-	int			e_opt;
+	int			E_opt;
 	char			*w_arg;
 
 	FILE			*fo;
@@ -892,7 +892,7 @@ dispatch_f(struct VSL_data *vsl, struct VSL_transaction * const pt[],
 			be_mark = BACKEND_MARKER;
 		} else
 			continue;
-		if (t->reason == VSL_r_esi && !CTX.e_opt)
+		if (t->reason == VSL_r_esi && !CTX.E_opt)
 			/* Skip ESI requests */
 			continue;
 		CTX.hitmiss = "-";
@@ -1112,9 +1112,9 @@ main(int argc, char * const *argv)
 			/* client mode */
 			CTX.c_opt = 1;
 			break;
-		case 'e':
+		case 'E':
 			/* show ESI */
-			CTX.e_opt = 1;
+			CTX.E_opt = 1;
 			break;
 		case 'F':
 			if (format != NULL)
diff --git a/bin/varnishncsa/varnishncsa_options.h b/bin/varnishncsa/varnishncsa_options.h
index b372647bc..896b33da0 100644
--- a/bin/varnishncsa/varnishncsa_options.h
+++ b/bin/varnishncsa/varnishncsa_options.h
@@ -72,18 +72,18 @@
 	    "Log client requests. This is the default. If -b is"	\
 	    " specified, then -c is needed to also log client requests"	\
 	)
-#define NCSA_OPT_e							\
-	VOPT("e", "[-e]", "Show ESI request",				\
+#define NCSA_OPT_E							\
+	VOPT("E", "[-E]", "Show ESI request",				\
 	    "Show ESI request."	\
 	)
 
 NCSA_OPT_a
 NCSA_OPT_b
 NCSA_OPT_c
-NCSA_OPT_e
 VSL_OPT_C
 VUT_OPT_d
 VUT_GLOBAL_OPT_D
+NCSA_OPT_E
 NCSA_OPT_F
 NCSA_OPT_f
 NCSA_OPT_g

From phk at FreeBSD.org  Mon Aug 19 11:53:06 2019
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Mon, 19 Aug 2019 11:53:06 +0000 (UTC)
Subject: [master] e2a5eb77f Fix test for wc(1) commands emitting leading
 whitespace.
Message-ID: <20190819115306.D3E1A104E76@lists.varnish-cache.org>


commit e2a5eb77f66802ae63440892049a541baf88ca2c
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Aug 19 11:52:15 2019 +0000

    Fix test for wc(1) commands emitting leading whitespace.
    
    Also fix -e -> -E I overlooked.

diff --git a/bin/varnishtest/tests/e00033.vtc b/bin/varnishtest/tests/e00033.vtc
index 73246abc3..2bcf84418 100644
--- a/bin/varnishtest/tests/e00033.vtc
+++ b/bin/varnishtest/tests/e00033.vtc
@@ -27,6 +27,5 @@ client c1 {
 	rxresp
 } -run
 
-shell -match "^0$" "varnishncsa -n ${v1_name}  -d  -q \"requrl ~ '/esi'\"    | wc -l"
-shell -match "^1$" "varnishncsa -n ${v1_name}  -d  -q \"requrl ~ '/esi'\" -e | wc -l"
-
+shell -match "^ *0$" {varnishncsa -n ${v1_name}  -d  -q "requrl ~ '/esi'"    | wc -l}
+shell -match "^ *1$" {varnishncsa -n ${v1_name}  -d  -q "requrl ~ '/esi'" -E | wc -l}

From phk at FreeBSD.org  Wed Aug 21 07:07:06 2019
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Wed, 21 Aug 2019 07:07:06 +0000 (UTC)
Subject: [master] 4b70a66cf Proper error message when giving wrong types to
 backend/probe fields
Message-ID: <20190821070706.3892F11265E@lists.varnish-cache.org>


commit 4b70a66cf7d2d7efdf84b777dd2f3d45b3668957
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Aug 21 07:05:42 2019 +0000

    Proper error message when giving wrong types to backend/probe fields
    
    Fixes   #3046

diff --git a/lib/libvcc/vcc_utils.c b/lib/libvcc/vcc_utils.c
index 0e6642552..8a08e9af9 100644
--- a/lib/libvcc/vcc_utils.c
+++ b/lib/libvcc/vcc_utils.c
@@ -329,12 +329,15 @@ vcc_UintVal(struct vcc *tl)
 	unsigned d = 0;
 	const char *p;
 
-	Expect(tl, CNUM);
-	for (p = tl->t->b; p < tl->t->e; p++) {
-		d *= 10;
-		d += *p - '0';
+	if (tl->t->tok != CNUM) {
+		Expect(tl, CNUM);
+	} else {
+		for (p = tl->t->b; p < tl->t->e; p++) {
+			d *= 10;
+			d += *p - '0';
+		}
+		vcc_NextToken(tl);
 	}
-	vcc_NextToken(tl);
 	return (d);
 }
 
@@ -344,6 +347,10 @@ vcc_DoubleVal(struct vcc *tl)
 	const size_t l = tl->t->e - tl->t->b;
 	char buf[l + 1];
 
+	if (tl->t->tok != CNUM && tl->t->tok != FNUM) {
+		Expect(tl, CNUM);
+		return (0);
+	}
 	assert(tl->t->tok == CNUM || tl->t->tok == FNUM);
 	memcpy(buf, tl->t->b, l);
 	vcc_NextToken(tl);

From phk at FreeBSD.org  Wed Aug 21 07:07:06 2019
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Wed, 21 Aug 2019 07:07:06 +0000 (UTC)
Subject: [master] 06095707f Test for #3046
Message-ID: <20190821070706.40812112660@lists.varnish-cache.org>


commit 06095707f6ce585466b017365a3b5571ca857b81
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Aug 21 07:06:29 2019 +0000

    Test for #3046

diff --git a/bin/varnishtest/tests/v00005.vtc b/bin/varnishtest/tests/v00005.vtc
index 4e37653b3..3fb2e6645 100644
--- a/bin/varnishtest/tests/v00005.vtc
+++ b/bin/varnishtest/tests/v00005.vtc
@@ -57,3 +57,12 @@ varnish v1 -errvcl {Probe request redefinition at:} {
 		}
 	}
 }
+
+varnish v1 -errvcl {Expected CNUM got '"120s"'} {
+        backend default {
+                .host = "127.0.0.1";
+                .probe = {
+                        .timeout = "120s";
+                }
+        }
+}

From phk at FreeBSD.org  Thu Aug 22 07:43:06 2019
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Thu, 22 Aug 2019 07:43:06 +0000 (UTC)
Subject: [master] eaaa5f5ae Minor flexelinting
Message-ID: <20190822074306.5CD21108D6C@lists.varnish-cache.org>


commit eaaa5f5ae59490c7bdcc5f5351c77d4f1d16a2b9
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Aug 22 06:43:16 2019 +0000

    Minor flexelinting

diff --git a/bin/varnishd/mgt/mgt_cli.c b/bin/varnishd/mgt/mgt_cli.c
index 403ef54f2..5ab6db68c 100644
--- a/bin/varnishd/mgt/mgt_cli.c
+++ b/bin/varnishd/mgt/mgt_cli.c
@@ -700,7 +700,7 @@ mgt_DumpRstCli(void)
 			continue;
 		printf(".. _ref_cli_");
 		for (p = cp->request; *p; p++)
-			putchar(*p == '.' ? '_' : *p);
+			fputc(*p == '.' ? '_' : *p, stdout);
 		printf(":\n\n");
 		printf("%s\n", cp->syntax);
 		for (j = 0; j < strlen(cp->syntax); j++)
diff --git a/flint.lnt b/flint.lnt
index 7b24a4aeb..b47a74bdb 100644
--- a/flint.lnt
+++ b/flint.lnt
@@ -127,6 +127,7 @@
 -esym(534, fprintf)
 -esym(534, vfprintf)
 -esym(534, sprintf)
+-esym(534, fputc)
 
 -esym(534, memset)
 -esym(534, memcpy)

From phk at FreeBSD.org  Thu Aug 22 07:43:06 2019
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Thu, 22 Aug 2019 07:43:06 +0000 (UTC)
Subject: [master] eed828937 Add an assert to try to catch #1853
Message-ID: <20190822074306.70E8E108D6F@lists.varnish-cache.org>


commit eed8289377394440c6c111f431f031735485d5ac
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Aug 22 07:38:43 2019 +0000

    Add an assert to try to catch #1853

diff --git a/bin/varnishd/cache/cache_lck.c b/bin/varnishd/cache/cache_lck.c
index 87dceb5ca..3d7dd74d8 100644
--- a/bin/varnishd/cache/cache_lck.c
+++ b/bin/varnishd/cache/cache_lck.c
@@ -212,6 +212,7 @@ Lck_CondWait(pthread_cond_t *cond, struct lock *lck, vtim_real when)
 		assert(when > 1e9);
 		ts.tv_nsec = (long)(modf(when, &t) * 1e9);
 		ts.tv_sec = (long)t;
+		assert(ts.tv_nsec >= 0 && ts.tv_nsec < 999999999);
 		errno = pthread_cond_timedwait(cond, &ilck->mtx, &ts);
 		assert(errno == 0 ||
 		    errno == ETIMEDOUT ||

From phk at FreeBSD.org  Mon Aug 26 07:54:07 2019
From: phk at FreeBSD.org (Poul-Henning Kamp)
Date: Mon, 26 Aug 2019 07:54:07 +0000 (UTC)
Subject: [master] c9705a90b openbsd: MAP_NOCORE equivalent and fixing build.
Message-ID: <20190826075407.81A5910C401@lists.varnish-cache.org>


commit c9705a90b8962055ca50f1d796118699bc0493da
Author: David Carlier <devnexen at gmail.com>
Date:   Sun Aug 25 16:04:08 2019 +0100

    openbsd: MAP_NOCORE equivalent and fixing build.

diff --git a/bin/varnishd/storage/mgt_storage_persistent.c b/bin/varnishd/storage/mgt_storage_persistent.c
index e2fbf1c0f..40d5d7233 100644
--- a/bin/varnishd/storage/mgt_storage_persistent.c
+++ b/bin/varnishd/storage/mgt_storage_persistent.c
@@ -55,8 +55,12 @@
 #endif
 
 #ifndef MAP_NOCORE
+#ifdef MAP_CONCEAL
+#define MAP_NOCORE MAP_CONCEAL /* XXX OpenBSD */
+#else
 #define MAP_NOCORE 0 /* XXX Linux */
 #endif
+#endif
 
 #ifndef MAP_NOSYNC
 #define MAP_NOSYNC 0 /* XXX Linux */
diff --git a/bin/varnishd/storage/storage_file.c b/bin/varnishd/storage/storage_file.c
index 78588ccab..7e0c0a2ae 100644
--- a/bin/varnishd/storage/storage_file.c
+++ b/bin/varnishd/storage/storage_file.c
@@ -48,8 +48,12 @@
 #include "VSC_smf.h"
 
 #ifndef MAP_NOCORE
+#ifdef MAP_CONCEAL
+#define MAP_NOCORE MAP_CONCEAL /* XXX OpenBSD */
+#else
 #define MAP_NOCORE 0 /* XXX Linux */
 #endif
+#endif
 
 #ifndef MAP_NOSYNC
 #define MAP_NOSYNC 0 /* XXX Linux */
diff --git a/lib/libvmod_unix/cred_compat.h b/lib/libvmod_unix/cred_compat.h
index fe3a5b9ff..6512d2122 100644
--- a/lib/libvmod_unix/cred_compat.h
+++ b/lib/libvmod_unix/cred_compat.h
@@ -68,8 +68,13 @@ get_ids(int fd, uid_t *uid, gid_t *gid)
 {
 
 #if defined(SO_PEERCRED)
+#if defined(__OpenBSD__)
+	typedef struct sockpeercred ucred_t;
+#else
+	typedef struct ucred ucred_t;
+#endif
 
-	struct ucred ucred;
+	ucred_t ucred;
 	socklen_t l = sizeof(ucred);
 
 	errno = 0;