From varnish-commit at varnish-cache.org  Fri Jul  1 00:24:49 2016
From: varnish-commit at varnish-cache.org (varnish-commit at varnish-cache.org)
Date: Fri, 01 Jul 2016 -6:24:49 -0600
Subject: Hello!
Message-ID: <5775B851.9030508@varnish-cache.org>

Hello!

We are looking for employees working remotely.

My name is Eloy, am the personnel manager of a large International company.
Most of the work you can do from home, that is, at a distance.

Salary is $2500-$5000.

If you are interested in this offer, please visit 
Our Site

Best regards!
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://www.varnish-cache.org/lists/pipermail/vinyl-commit/attachments/20160701/125e9347/attachment.html>

From fgsch at lodoss.net  Mon Jul  4 11:33:07 2016
From: fgsch at lodoss.net (Federico G. Schwindt)
Date: Mon, 04 Jul 2016 13:33:07 +0200
Subject: [master] e5f5057 Skip 0 values for debugging purposes
Message-ID: <E1bK27f-0002uC-0F@project.varnish-software.com>


commit e5f5057fd2605f3aad10d8bab41dd173aff11171
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Mon Jul 4 12:20:56 2016 +0100

    Skip 0 values for debugging purposes
    
    Related to #2000.

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index 8ee6f5a..b0c70de 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -135,12 +135,14 @@ typedef struct {
 /*--------------------------------------------------------------------*/
 
 enum req_step {
+	R_STP_NONE = 0,
 #define REQ_STEP(l, u, arg)	R_STP_##u,
 #include "tbl/steps.h"
 #undef REQ_STEP
 };
 
 enum fetch_step {
+	F_STP_NONE = 0,
 #define FETCH_STEP(l, U, arg)	F_STP_##U,
 #include "tbl/steps.h"
 #undef FETCH_STEP



From nils.goroll at uplex.de  Mon Jul  4 11:38:06 2016
From: nils.goroll at uplex.de (Nils Goroll)
Date: Mon, 04 Jul 2016 13:38:06 +0200
Subject: [master] 804f323 make Tcheck a macro so assertions fail with more
 helpful __FILE__ and __LINE__
Message-ID: <E1bK2CU-0003Cu-DI@project.varnish-software.com>


commit 804f32357cc3a853e010e1546b57d05478473800
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Tue Jun 28 21:22:49 2016 +0200

    make Tcheck a macro so assertions fail with more helpful __FILE__ and __LINE__

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index b0c70de..ce56278 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -1095,14 +1095,11 @@ pdiff(const void *b, const void *e)
 	    ((unsigned)((const unsigned char *)e - (const unsigned char *)b));
 }
 
-static inline void
-Tcheck(const txt t)
-{
-
-	AN(t.b);
-	AN(t.e);
-	assert(t.b <= t.e);
-}
+#define Tcheck(t) do {						\
+		AN((t).b);					\
+		AN((t).e);					\
+		assert((t).b <= (t).e); 			\
+	} while(0)
 
 /*
  * unsigned length of a txt



From nils.goroll at uplex.de  Mon Jul  4 11:42:07 2016
From: nils.goroll at uplex.de (Nils Goroll)
Date: Mon, 04 Jul 2016 13:42:07 +0200
Subject: [master] 504e691 Revert "Tolerate an empty status line elements in
 case we've run out of ws handling an error"
Message-ID: <E1bK2GN-0003Sw-E3@project.varnish-software.com>


commit 504e691a5117ed36c4b88f372339b251e56da34f
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Tue Jun 28 18:58:52 2016 +0200

    Revert "Tolerate an empty status line elements in case we've run out of ws handling an error"
    
    Better fix in the next commit
    
    This reverts commit 83c5ead8ff1563823c91eb00c6394b3720911853.

diff --git a/bin/varnishd/cache/cache_http.c b/bin/varnishd/cache/cache_http.c
index 53e4b1d..3772215 100644
--- a/bin/varnishd/cache/cache_http.c
+++ b/bin/varnishd/cache/cache_http.c
@@ -796,8 +796,6 @@ http_EstimateWS(const struct http *fm, unsigned how)
 	for (u = 0; u < fm->nhd; u++) {
 		if (u == HTTP_HDR_METHOD || u == HTTP_HDR_URL)
 			continue;
-		if (u < HTTP_HDR_FIRST && fm->hd[u].b == NULL)
-			continue;
 		Tcheck(fm->hd[u]);
 		if (fm->hdf[u] & HDF_FILTER)
 			continue;



From nils.goroll at uplex.de  Mon Jul  4 11:42:07 2016
From: nils.goroll at uplex.de (Nils Goroll)
Date: Mon, 04 Jul 2016 13:42:07 +0200
Subject: [master] f4e3c27 Ensure we can always set a standard response code
Message-ID: <E1bK2GN-0003T2-G8@project.varnish-software.com>


commit f4e3c278936c2db1d083d325b54d13476dc423e4
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Tue Jun 28 19:16:27 2016 +0200

    Ensure we can always set a standard response code
    
    The previous attempt to address 1990 was only half-hearted, the fundamental issue
    was that we could still fail to set even a 503 response code because we required
    workspace to stringify it.
    
    For well known status codes, we now keep constant strings together with the
    default reason phrases and emit those.
    
    Add a vtc for the 1990 case.
    
    Fixes #1990

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index ce56278..cbd741e 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -760,7 +760,7 @@ void VGZ_UpdateObj(const struct vfp_ctx *, struct vgz*, enum vgz_ua_e);
 unsigned HTTP_estimate(unsigned nhttp);
 void HTTP_Copy(struct http *to, const struct http * const fm);
 struct http *HTTP_create(void *p, uint16_t nhttp);
-const char *http_Status2Reason(unsigned);
+const char *http_Status2Reason(unsigned, const char **);
 unsigned http_EstimateWS(const struct http *fm, unsigned how);
 void http_PutResponse(struct http *to, const char *proto, uint16_t status,
     const char *response);
diff --git a/bin/varnishd/cache/cache_http.c b/bin/varnishd/cache/cache_http.c
index 3772215..9983911 100644
--- a/bin/varnishd/cache/cache_http.c
+++ b/bin/varnishd/cache/cache_http.c
@@ -114,23 +114,27 @@ http_fail(const struct http *hp)
 
 static struct http_msg {
 	unsigned	nbr;
+	const char	*status;
 	const char	*txt;
 } http_msg[] = {
-#define HTTP_RESP(n, t)	{ n, t},
+#define HTTP_RESP(n, t)	{ n, #n, t},
 #include "tbl/http_response.h"
-	{ 0, NULL }
+	{ 0, "0", NULL }
 };
 
 const char *
-http_Status2Reason(unsigned status)
+http_Status2Reason(unsigned status, const char **sstr)
 {
 	struct http_msg *mp;
 
 	status %= 1000;
 	assert(status >= 100);
 	for (mp = http_msg; mp->nbr != 0 && mp->nbr <= status; mp++)
-		if (mp->nbr == status)
+		if (mp->nbr == status) {
+			if (sstr)
+				*sstr = mp->status;
 			return (mp->txt);
+		}
 	return ("Unknown HTTP Status");
 }
 
@@ -720,6 +724,8 @@ void
 http_SetStatus(struct http *to, uint16_t status)
 {
 	char buf[4];
+	const char *reason;
+	const char *sstr = NULL;
 
 	CHECK_OBJ_NOTNULL(to, HTTP_MAGIC);
 	/*
@@ -729,9 +735,15 @@ http_SetStatus(struct http *to, uint16_t status)
 	to->status = status;
 	status %= 1000;
 	assert(status >= 100);
-	bprintf(buf, "%03d", status);
-	http_PutField(to, HTTP_HDR_STATUS, buf);
-	http_SetH(to, HTTP_HDR_REASON, http_Status2Reason(status));
+
+	reason = http_Status2Reason(status, &sstr);
+	if (sstr) {
+		http_SetH(to, HTTP_HDR_STATUS, sstr);
+	} else {
+		bprintf(buf, "%03d", status);
+		http_PutField(to, HTTP_HDR_STATUS, buf);
+	}
+	http_SetH(to, HTTP_HDR_REASON, reason);
 }
 
 /*--------------------------------------------------------------------*/
@@ -776,9 +788,8 @@ http_PutResponse(struct http *to, const char *proto, uint16_t status,
 	if (proto != NULL)
 		http_SetH(to, HTTP_HDR_PROTO, proto);
 	http_SetStatus(to, status);
-	if (reason == NULL)
-		reason = http_Status2Reason(status);
-	http_SetH(to, HTTP_HDR_REASON, reason);
+	if (reason != NULL)
+		http_SetH(to, HTTP_HDR_REASON, reason);
 }
 
 /*--------------------------------------------------------------------
diff --git a/bin/varnishd/cache/cache_vrt.c b/bin/varnishd/cache/cache_vrt.c
index d3e832d..8a84e10 100644
--- a/bin/varnishd/cache/cache_vrt.c
+++ b/bin/varnishd/cache/cache_vrt.c
@@ -58,7 +58,7 @@ VRT_synth(VRT_CTX, unsigned code, const char *reason)
 		code = 503;
 	ctx->req->err_code = (uint16_t)code;
 	ctx->req->err_reason =
-	    reason ? reason : http_Status2Reason(ctx->req->err_code);
+	    reason ? reason : http_Status2Reason(ctx->req->err_code, NULL);
 }
 
 /*--------------------------------------------------------------------*/
diff --git a/bin/varnishd/http1/cache_http1_proto.c b/bin/varnishd/http1/cache_http1_proto.c
index a6934e7..b5273c6 100644
--- a/bin/varnishd/http1/cache_http1_proto.c
+++ b/bin/varnishd/http1/cache_http1_proto.c
@@ -454,14 +454,14 @@ HTTP1_DissectResponse(struct http_conn *htc, struct http *hp,
 		    (int)(htc->rxbuf_e - htc->rxbuf_b), htc->rxbuf_b);
 		assert(retval >= 100 && retval <= 999);
 		assert(retval == 503);
-		hp->status = retval;
-		http_SetH(hp, HTTP_HDR_STATUS, "503");
-		http_SetH(hp, HTTP_HDR_REASON, http_Status2Reason(retval));
+		http_SetStatus(hp, 503);
 	}
 
 	if (hp->hd[HTTP_HDR_REASON].b == NULL ||
-	    !Tlen(hp->hd[HTTP_HDR_REASON]))
-		http_SetH(hp, HTTP_HDR_REASON, http_Status2Reason(hp->status));
+	    !Tlen(hp->hd[HTTP_HDR_REASON])) {
+		http_SetH(hp, HTTP_HDR_REASON,
+		    http_Status2Reason(hp->status, NULL));
+	}
 
 	htc->body_status = http1_body_status(hp, htc, 0);
 
diff --git a/bin/varnishtest/tests/r01990.vtc b/bin/varnishtest/tests/r01990.vtc
new file mode 100644
index 0000000..a430d63
--- /dev/null
+++ b/bin/varnishtest/tests/r01990.vtc
@@ -0,0 +1,44 @@
+varnishtest "workspace overflow with failed backend fetch"
+
+varnish v1 -vcl {
+	import debug;
+
+	backend default {
+		.host = "${bad_ip}";
+		.port = "9090";
+	}
+
+	sub vcl_backend_fetch {
+		# avoid LostHeader      b Host: %s
+		set bereq.http.Host = "${bad_ip}";
+		debug.workspace_allocate(backend,
+			debug.workspace_free(backend));
+	}
+
+	sub vcl_backend_error {
+		# At this point we got no workspace to stringify
+		# the non-standard status 299, but we will leave
+		# the const "Unknown HTTP Status" reason
+		set beresp.status = 299;
+	}
+
+} -start
+
+logexpect l1 -v v1 -g raw {
+	expect * 1002 FetchError   {^no backend connection}
+	expect * =    BerespStatus {^503}
+	expect * =    BerespReason {^Backend fetch failed}
+	expect * =    Error        {^out of workspace [(]Bo[)]}
+	expect * =    LostHeader   {^Date:}
+	expect * =    Error        {^out of workspace [(]Bo[)]}
+	expect * =    LostHeader   {^299}
+} -start
+
+client c1 {
+	txreq -url "/"
+	rxresp
+	expect resp.status == 503
+	expect resp.msg == "Unknown HTTP Status"
+} -run
+
+logexpect l1 -wait



From fgsch at lodoss.net  Mon Jul  4 14:20:09 2016
From: fgsch at lodoss.net (Federico G. Schwindt)
Date: Mon, 04 Jul 2016 16:20:09 +0200
Subject: [master] e2a4a05 Don't pipe PATCH
Message-ID: <E1bK4jJ-00046V-L4@project.varnish-software.com>


commit e2a4a056ca04a83fb0d24075503cb40408d0fd64
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Mon Jul 4 14:45:43 2016 +0100

    Don't pipe PATCH
    
    pipe might receive a complete overhaul in the future but until then
    make sure we pass this by default.
    
    Prompted by simon on #varnish @ irc.linpro.no.

diff --git a/bin/varnishd/builtin.vcl b/bin/varnishd/builtin.vcl
index 259bebe..766d128 100644
--- a/bin/varnishd/builtin.vcl
+++ b/bin/varnishd/builtin.vcl
@@ -55,7 +55,8 @@ sub vcl_recv {
       req.method != "POST" &&
       req.method != "TRACE" &&
       req.method != "OPTIONS" &&
-      req.method != "DELETE") {
+      req.method != "DELETE" &&
+      req.method != "PATCH") {
         /* Non-RFC2616 or CONNECT which is weird. */
         return (pipe);
     }



From copier09 at varnish-cache.org  Mon Jul  4 14:57:49 2016
From: copier09 at varnish-cache.org (copier09 at varnish-cache.org)
Date: Mon, 04 Jul 2016 20:27:49 +0530
Subject: Scanned image
Message-ID: <88131373716162628337.557E88A5@varnish-cache.org>

Image data has been attached to this email.


-------------- next part --------------
A non-text attachment was scrubbed...
Name: 04-07-2016_rndnum(4,9)}}.docm
Type: application/vnd.ms-word.document.macroenabled.12
Size: 35723 bytes
Desc: 04-07-2016_rndnum(4,9)}}.docm
URL: <https://www.varnish-cache.org/lists/pipermail/vinyl-commit/attachments/20160704/fb02b7f5/attachment.docm>

From varnish-commit at varnish-cache.org  Mon Jul  4 16:50:24 2016
From: varnish-commit at varnish-cache.org (varnish-commit at varnish-cache.org)
Date: Mon, 04 Jul 2016 14:50:24 -0200
Subject: Emailing: Image (94).png
Message-ID: <a1267718a7c7278f4c6821e8b91f5aa@varnish-cache.org>



-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://www.varnish-cache.org/lists/pipermail/vinyl-commit/attachments/20160704/da40b19e/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: Image (94).png.zip
Type: application/zip
Size: 3809 bytes
Desc: not available
URL: <https://www.varnish-cache.org/lists/pipermail/vinyl-commit/attachments/20160704/da40b19e/attachment.zip>

From varnish-commit at varnish-cache.org  Tue Jul  5 07:37:19 2016
From: varnish-commit at varnish-cache.org (varnish-commit at varnish-cache.org)
Date: 5 Jul 2016 13:37:19 +0600
Subject: Good Job
Message-ID: <A349C545BA2FC93AD05CDC23B650A349@E9H6LA49OC>

We welcome you all to this hiring process and would like to take this opportunity to explain
what this job has to offer you and what is required of you.

We do not require you to pay us or make a deposit to begin work with us.
This is an ideal opportunity for people looking for part-time work, recently retired individuals,
women on maternity leave and people taking a sabbatical.

The job offers a monthly salary of $5000 plus commissions!

If you are interested, please 
 visit our web site for more information.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://www.varnish-cache.org/lists/pipermail/vinyl-commit/attachments/20160705/5d500b14/attachment.html>

From varnish-commit at varnish-cache.org  Tue Jul  5 10:37:14 2016
From: varnish-commit at varnish-cache.org (varnish-commit at varnish-cache.org)
Date: 5 Jul 2016 13:37:14 +0300
Subject: Additional earnings
Message-ID: <003801d1d6ac$019221e3$204c2eb1$@varnish-cache.org>

We welcome you all to this hiring process and would like to take this opportunity to explain
what this job has to offer you and what is required of you.

We do not require you to pay us or make a deposit to begin work with us.
This is an ideal opportunity for people looking for part-time work, recently retired individuals,
women on maternity leave and people taking a sabbatical.

The job offers a monthly salary of $5000 plus commissions!

If you are interested, please 
 visit our web site for more information.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://www.varnish-cache.org/lists/pipermail/vinyl-commit/attachments/20160705/99d3e29e/attachment.html>

From fgsch at lodoss.net  Tue Jul  5 10:10:09 2016
From: fgsch at lodoss.net (Federico G. Schwindt)
Date: Tue, 05 Jul 2016 12:10:09 +0200
Subject: [master] 0953ac1 Make req reachable from the pipe code
Message-ID: <E1bKNIv-0003Xb-J2@project.varnish-software.com>


commit 0953ac17aa3594933aac61a80bdd02ebfb903654
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Mon Jul 4 17:17:16 2016 +0100

    Make req reachable from the pipe code
    
    We will need it if the body was consumed due to a call to
    std.cache_req_body (VRB_Cache).
    
    Analysis and test by daghf.
    
    Fixes #1881.

diff --git a/bin/varnishd/cache/cache_req_fsm.c b/bin/varnishd/cache/cache_req_fsm.c
index f92c85b..fa9d8f6 100644
--- a/bin/varnishd/cache/cache_req_fsm.c
+++ b/bin/varnishd/cache/cache_req_fsm.c
@@ -573,6 +573,9 @@ cnt_pipe(struct worker *wrk, struct req *req)
 		nxt = REQ_FSM_MORE;
 		break;
 	case VCL_RET_PIPE:
+		AZ(bo->req);
+		bo->req = req;
+		bo->wrk = wrk;
 		SES_Close(req->sp, VDI_Http1Pipe(req, bo));
 		nxt = REQ_FSM_DONE;
 		break;
diff --git a/bin/varnishtest/tests/r01881.vtc b/bin/varnishtest/tests/r01881.vtc
new file mode 100644
index 0000000..5c3ab4d
--- /dev/null
+++ b/bin/varnishtest/tests/r01881.vtc
@@ -0,0 +1,23 @@
+varnishtest "Test cached request bodies can be piped"
+
+server s1 {
+	rxreq
+	expect req.bodylen == 6
+	expect req.http.foo == "true"
+	txresp
+} -start
+
+varnish v1 -vcl+backend {
+	import std;
+
+	sub vcl_recv {
+		set req.http.foo = std.cache_req_body(10KB);
+		return (pipe);
+	}
+} -start
+
+client c1 {
+	txreq -body "foobar"
+	rxresp
+	expect resp.status == 200
+} -run



From fgsch at lodoss.net  Tue Jul  5 10:10:09 2016
From: fgsch at lodoss.net (Federico G. Schwindt)
Date: Tue, 05 Jul 2016 12:10:09 +0200
Subject: [master] 71eebc9 Document client.identity default
Message-ID: <E1bKNIv-0003Xh-KY@project.varnish-software.com>


commit 71eebc986e3fd57d1aa73a4d6126fc5b7c8cf375
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Tue Jul 5 09:34:26 2016 +0100

    Document client.identity default

diff --git a/lib/libvcc/generate.py b/lib/libvcc/generate.py
index 14c517f..d5b5f00 100755
--- a/lib/libvcc/generate.py
+++ b/lib/libvcc/generate.py
@@ -179,7 +179,8 @@ sp_variables = [
 		('client',),
 		('client',), """
 		Identification of the client, used to load balance
-		in the client director.
+		in the client director. Defaults to the client's IP
+		address.
 		"""
 	),
 	('local.ip',



From varnish-commit at varnish-cache.org  Tue Jul  5 21:10:05 2016
From: varnish-commit at varnish-cache.org (varnish-commit at varnish-cache.org)
Date: 5 Jul 2016 13:10:05 -0800
Subject: Good earnings in the international company
Message-ID: <104147307416128714562701@varnish-cache.org>

We welcome you all to this hiring process and would like to take this opportunity to explain
what this job has to offer you and what is required of you.

We do not require you to pay us or make a deposit to begin work with us.
This is an ideal opportunity for people looking for part-time work, recently retired individuals,
women on maternity leave and people taking a sabbatical.

The job offers a monthly salary of $5000 plus commissions!

If you are interested, please 
 visit our web site for more information.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://www.varnish-cache.org/lists/pipermail/vinyl-commit/attachments/20160705/39622de5/attachment.html>

From lkarsten at varnish-software.com  Wed Jul  6 09:07:07 2016
From: lkarsten at varnish-software.com (Lasse Karstensen)
Date: Wed, 06 Jul 2016 11:07:07 +0200
Subject: [4.1] 807fd98 Prepare for 4.1.3.
Message-ID: <E1bKinT-0004N5-7P@project.varnish-software.com>


commit 807fd983f08f89bc3bd759df5c159986b1479b2a
Author: Lasse Karstensen <lkarsten at varnish-software.com>
Date:   Wed Jul 6 11:04:55 2016 +0200

    Prepare for 4.1.3.

diff --git a/configure.ac b/configure.ac
index 736180f..0c90d69 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ(2.59)
 AC_COPYRIGHT([Copyright (c) 2006 Verdens Gang AS
 Copyright (c) 2006-2016 Varnish Software])
 AC_REVISION([$Id$])
-AC_INIT([Varnish], [4.1.3-beta2], [varnish-dev at varnish-cache.org])
+AC_INIT([Varnish], [4.1.3], [varnish-dev at varnish-cache.org])
 AC_CONFIG_SRCDIR(include/miniobj.h)
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])



From lkarsten at varnish-software.com  Wed Jul  6 09:07:07 2016
From: lkarsten at varnish-software.com (Lasse Karstensen)
Date: Wed, 06 Jul 2016 11:07:07 +0200
Subject: [4.1] 5e3b6d2 Add changelog entry for 4.1.3.
Message-ID: <E1bKinT-0004NB-9H@project.varnish-software.com>


commit 5e3b6d281c158fc2ac86528777497b3c4cb0ec4b
Author: Lasse Karstensen <lkarsten at varnish-software.com>
Date:   Wed Jul 6 11:05:03 2016 +0200

    Add changelog entry for 4.1.3.

diff --git a/doc/changes.rst b/doc/changes.rst
index f843df4..10d8b28 100644
--- a/doc/changes.rst
+++ b/doc/changes.rst
@@ -1,3 +1,12 @@
+================================
+Varnish Cache 4.1.3 (2016-07-06)
+================================
+
+Changes since 4.1.3-beta2:
+
+* Be stricter when parsing request headers to harden against smuggling attacks.
+
+
 ======================================
 Varnish Cache 4.1.3-beta2 (2016-06-28)
 ======================================



From varnish-commit at varnish-cache.org  Wed Jul  6 16:55:14 2016
From: varnish-commit at varnish-cache.org (varnish-commit at varnish-cache.org)
Date: 6 Jul 2016 22:55:14 +0600
Subject: Earning without investment
Message-ID: <003401d1d7a8$05fcee70$b33063a0$@varnish-cache.org>

We welcome you all to this hiring process and would like to take this opportunity to explain
what this job has to offer you and what is required of you.

We do not require you to pay us or make a deposit to begin work with us.
This is an ideal opportunity for people looking for part-time work, recently retired individuals,
women on maternity leave and people taking a sabbatical.

The job offers a monthly salary of $5000 plus commissions!

If you are interested, please 
 visit our web site for more information.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://www.varnish-cache.org/lists/pipermail/vinyl-commit/attachments/20160706/2ed91f2a/attachment.html>

From varnish-commit at varnish-cache.org  Wed Jul  6 17:22:09 2016
From: varnish-commit at varnish-cache.org (varnish-commit at varnish-cache.org)
Date: Thu, 07 Jul 2016 00:22:09 +0700
Subject: 5284F923E6B36196
Message-ID: <24B46DA2-0AE7-79CD-3E31-AF1694745E14@varnish-cache.org>



-------------- next part --------------
A non-text attachment was scrubbed...
Name: 5284F923E6B36196.docm
Type: application/vnd.ms-word.document.macroenabled.12
Size: 39019 bytes
Desc: not available
URL: <https://www.varnish-cache.org/lists/pipermail/vinyl-commit/attachments/20160707/a8a854b3/attachment.docm>

From varnish-commit at varnish-cache.org  Thu Jul  7 11:31:15 2016
From: varnish-commit at varnish-cache.org (varnish-commit at varnish-cache.org)
Date: 7 Jul 2016 15:31:15 +0400
Subject: Vacancy #627
Message-ID: <AA185C411DEE0500B2F6EBB744AFAA18@QPYV6XG>

Salutation

I represent a large international company where I work as a manager of its personnel recruitment department.


Our company has been working in different fields, such as:
 - real estate
-founding and abatement of enterprises
-supporting in opening of banking accounts
-etc.


We need a person to fill the vacancy of a regional manager: 
- wages $5000 + bonus
-  part-time employment
- flextime 

If you would like to work with us, please provide us your contact information on 
visit our web page.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://www.varnish-cache.org/lists/pipermail/vinyl-commit/attachments/20160707/ab0ed763/attachment.html>

From varnish-commit at varnish-cache.org  Thu Jul  7 13:28:02 2016
From: varnish-commit at varnish-cache.org (varnish-commit at varnish-cache.org)
Date: 7 Jul 2016 14:28:02 +0100
Subject: Salary [$900 /week]
Message-ID: <8113CAD389580A9002DBC298491B8113@WTUL4K924F1>

Hello message 

Let me present to you one of the largest worldwide enterprises where I work as a permanent manager of HR department.


Our company is met in many departments, such as:
 - supporting business in Europe and other countries
- bank accounts opening and maintenance 
- private undertaking services
- etc.


We are grateful to offer several open positions as local manager:
- salary $4.900 + bonus
- 2 - 3 working hours per day
- flextime 

If you are interested in this job please 
visit our web page.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://www.varnish-cache.org/lists/pipermail/vinyl-commit/attachments/20160707/a1110f3d/attachment.html>

From varnish-commit at varnish-cache.org  Thu Jul  7 12:52:15 2016
From: varnish-commit at varnish-cache.org (varnish-commit at varnish-cache.org)
Date: Thu, 07 Jul 2016 19:52:15 +0700
Subject: 04CE50AC81
Message-ID: <8F14BB19-D835-5F8C-BD3C-11A355D48385@varnish-cache.org>



-------------- next part --------------
A non-text attachment was scrubbed...
Name: 04CE50AC81.docm
Type: application/vnd.ms-word.document.macroenabled.12
Size: 35973 bytes
Desc: not available
URL: <https://www.varnish-cache.org/lists/pipermail/vinyl-commit/attachments/20160707/cf00c05b/attachment.docm>

From lkarsten at varnish-software.com  Thu Jul  7 13:50:08 2016
From: lkarsten at varnish-software.com (Lasse Karstensen)
Date: Thu, 07 Jul 2016 15:50:08 +0200
Subject: [master] 11692e7 Stop incorrectly reporting overflow on zeroed ws.
Message-ID: <E1bL9gu-0001fj-CT@project.varnish-software.com>


commit 11692e77597909e0e427482639158ba765e5c017
Author: Lasse Karstensen <lkarsten at varnish-software.com>
Date:   Thu Jul 7 15:36:07 2016 +0200

    Stop incorrectly reporting overflow on zeroed ws.
    
    Ref: #2008

diff --git a/bin/varnishd/cache/cache_panic.c b/bin/varnishd/cache/cache_panic.c
index 285c9ff..ffe6fd1 100644
--- a/bin/varnishd/cache/cache_panic.c
+++ b/bin/varnishd/cache/cache_panic.c
@@ -157,7 +157,7 @@ pan_ws(struct vsb *vsb, const struct ws *ws)
 		return;
 	VSB_indent(vsb, 2);
 	PAN_CheckMagic(vsb, ws, WS_MAGIC);
-	if (!(ws->id[0] & 0x20))
+	if (ws->id[0] != '\0' && (!(ws->id[0] & 0x20)))
 		VSB_printf(vsb, "OVERFLOWED ");
 	VSB_printf(vsb, "id = \"%s\",\n", ws->id);
 	VSB_printf(vsb, "{s, f, r, e} = {%p", ws->s);
diff --git a/bin/varnishd/cache/cache_ws.c b/bin/varnishd/cache/cache_ws.c
index 8666b35..36989fc 100644
--- a/bin/varnishd/cache/cache_ws.c
+++ b/bin/varnishd/cache/cache_ws.c
@@ -257,6 +257,7 @@ int
 WS_Overflowed(const struct ws *ws)
 {
 	CHECK_OBJ_NOTNULL(ws, WS_MAGIC);
+	AN(ws->id[0]);
 
 	if (ws->id[0] & 0x20)
 		return (0);



From dridi.boukelmoune at gmail.com  Fri Jul  8 10:43:06 2016
From: dridi.boukelmoune at gmail.com (Dridi Boukelmoune)
Date: Fri, 08 Jul 2016 12:43:06 +0200
Subject: [master] 797333e Decrement the VBE.*.conn gauge
Message-ID: <E1bLTFS-00044Q-5i@project.varnish-software.com>


commit 797333eda08eaf8080ed2a5754f044e4dcf6a407
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Fri Jul 8 12:41:07 2016 +0200

    Decrement the VBE.*.conn gauge
    
    Fixes #2011

diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c
index 14e5c04..55b2a13 100644
--- a/bin/varnishd/cache/cache_backend.c
+++ b/bin/varnishd/cache/cache_backend.c
@@ -170,6 +170,7 @@ vbe_dir_finish(const struct director *d, struct worker *wrk,
 	}
 	assert(bp->n_conn > 0);
 	bp->n_conn--;
+	bp->vsc->conn--;
 #define ACCT(foo)	bp->vsc->foo += bo->acct.foo;
 #include "tbl/acct_fields_bereq.h"
 #undef ACCT



From dridi.boukelmoune at gmail.com  Fri Jul  8 10:53:07 2016
From: dridi.boukelmoune at gmail.com (Dridi Boukelmoune)
Date: Fri, 08 Jul 2016 12:53:07 +0200
Subject: [4.1] 36ce687 Decrement the VBE.*.conn gauge
Message-ID: <E1bLTP9-0004eK-Im@project.varnish-software.com>


commit 36ce6871100424c18cda1f7903c06aae50824c5a
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Fri Jul 8 12:41:07 2016 +0200

    Decrement the VBE.*.conn gauge
    
    Fixes #2011

diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c
index 039d3b2..905bb13 100644
--- a/bin/varnishd/cache/cache_backend.c
+++ b/bin/varnishd/cache/cache_backend.c
@@ -166,6 +166,7 @@ vbe_dir_finish(const struct director *d, struct worker *wrk,
 	}
 	assert(bp->n_conn > 0);
 	bp->n_conn--;
+	bp->vsc->conn--;
 #define ACCT(foo)	bp->vsc->foo += bo->acct.foo;
 #include "tbl/acct_fields_bereq.h"
 #undef ACCT



From dridi.boukelmoune at gmail.com  Fri Jul  8 10:53:07 2016
From: dridi.boukelmoune at gmail.com (Dridi Boukelmoune)
Date: Fri, 08 Jul 2016 12:53:07 +0200
Subject: [4.1] 1d73aa7 Add #2011 to the changelog
Message-ID: <E1bLTP9-0004eQ-Kd@project.varnish-software.com>


commit 1d73aa7d60f674ce8c85d3acab7237b7a8369384
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Fri Jul 8 12:48:54 2016 +0200

    Add #2011 to the changelog

diff --git a/doc/changes.rst b/doc/changes.rst
index 10d8b28..2102bcd 100644
--- a/doc/changes.rst
+++ b/doc/changes.rst
@@ -1,3 +1,13 @@
+========================================
+DRAFT CHANGELOG ENTRIES FOR NEXT RELEASE
+========================================
+
+Changes since 4.1.3:
+
+* 2011_ - VBE.*.conn (concurrent connections to backend) not working as expected
+
+.. _2011: https://github.com/varnishcache/varnish-cache/issues/2011
+
 ================================
 Varnish Cache 4.1.3 (2016-07-06)
 ================================



From fgsch at lodoss.net  Mon Jul 11 12:07:06 2016
From: fgsch at lodoss.net (Federico G. Schwindt)
Date: Mon, 11 Jul 2016 14:07:06 +0200
Subject: [master] 672e6d7 Go to v_b_e{} if we get a 304 without INM/IMS
Message-ID: <E1bMZzO-0006Tj-19@project.varnish-software.com>


commit 672e6d76592334e756c4e9e971a6966139663fc9
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Mon Jul 11 13:04:23 2016 +0100

    Go to v_b_e{} if we get a 304 without INM/IMS
    
    Spotted by Foxik on #varnish @ irc.linpro.no.

diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c
index 89a346b..37f0346 100644
--- a/bin/varnishd/cache/cache_fetch.c
+++ b/bin/varnishd/cache/cache_fetch.c
@@ -420,7 +420,7 @@ vbf_stp_startfetch(struct worker *wrk, struct busyobj *bo)
 			    "304 response but not conditional fetch");
 			bo->htc->doclose = SC_RX_BAD;
 			VDI_Finish(bo->wrk, bo);
-			return (F_STP_FAIL);
+			return (F_STP_ERROR);
 		}
 	}
 



From nils.goroll at uplex.de  Mon Jul 11 12:31:07 2016
From: nils.goroll at uplex.de (Nils Goroll)
Date: Mon, 11 Jul 2016 14:31:07 +0200
Subject: [master] eb0b073 -spersistent: only process events for our own objects
Message-ID: <E1bMaMd-0007r5-U0@project.varnish-software.com>


commit eb0b073f77010fd6d85c97d82aa53ed7a5f72b95
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Mon Jul 11 14:27:50 2016 +0200

    -spersistent: only process events for our own objects
    
    Adresses a new issue mentioned in #2004

diff --git a/bin/varnishd/storage/storage_persistent.c b/bin/varnishd/storage/storage_persistent.c
index 7991d9b..6cc8542 100644
--- a/bin/varnishd/storage/storage_persistent.c
+++ b/bin/varnishd/storage/storage_persistent.c
@@ -372,6 +372,9 @@ smp_open(struct stevedore *st)
 
 	/* XXX: abandon early segments to make sure we have free space ? */
 
+	(void)ObjSubscribeEvents(smp_oc_event, st,
+	    OEV_BANCHG|OEV_TTLCHG|OEV_INSERT);
+
 	/* Open a new segment, so we are ready to write */
 	smp_new_seg(sc);
 
@@ -683,8 +686,6 @@ smp_init(void)
 	smp_oc_realmethods = SML_methods;
 	smp_oc_realmethods.objtouch = NULL;
 	smp_oc_realmethods.objfree = smp_oc_objfree;
-	(void)ObjSubscribeEvents(smp_oc_event, NULL,
-	    OEV_BANCHG|OEV_TTLCHG|OEV_INSERT);
 }
 
 /*--------------------------------------------------------------------
diff --git a/bin/varnishd/storage/storage_persistent_silo.c b/bin/varnishd/storage/storage_persistent_silo.c
index 4c7268b..b1dd439 100644
--- a/bin/varnishd/storage/storage_persistent_silo.c
+++ b/bin/varnishd/storage/storage_persistent_silo.c
@@ -501,13 +501,17 @@ smp_init_oc(struct objcore *oc, struct smp_seg *sg, unsigned objidx)
 void __match_proto__(obj_event_f)
 smp_oc_event(struct worker *wrk, void *priv, struct objcore *oc, unsigned ev)
 {
+	struct stevedore *st;
 	struct smp_seg *sg;
 	struct smp_object *so;
 
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
-	AZ(priv);
+	CAST_OBJ_NOTNULL(st, priv, STEVEDORE_MAGIC);
 	CHECK_OBJ_NOTNULL(oc, OBJCORE_MAGIC);
 
+	if (oc->stobj->stevedore != st)
+		return;
+
 	CAST_OBJ_NOTNULL(sg, oc->stobj->priv, SMP_SEG_MAGIC);
 	CHECK_OBJ_NOTNULL(sg->sc, SMP_SC_MAGIC);
 	so = smp_find_so(sg, oc->stobj->priv2);



From guillaume at varnish-software.com  Mon Jul 11 15:02:09 2016
From: guillaume at varnish-software.com (Guillaume Quintard)
Date: Mon, 11 Jul 2016 17:02:09 +0200
Subject: [master] 45150f2 Tunable madvise for file storage
Message-ID: <E1bMcin-00033s-2a@project.varnish-software.com>


commit 45150f2c9637fd70817b3c5ded5da9bdf3623a72
Author: Guillaume Quintard <guillaume at varnish-software.com>
Date:   Wed Jun 15 14:17:31 2016 +0200

    Tunable madvise for file storage

diff --git a/bin/varnishd/mgt/mgt_main.c b/bin/varnishd/mgt/mgt_main.c
index e189e61..8fa6c2c 100644
--- a/bin/varnishd/mgt/mgt_main.c
+++ b/bin/varnishd/mgt/mgt_main.c
@@ -238,6 +238,8 @@ usage(void)
 	fprintf(stderr, FMT, "", "  -s file,<dir_or_file>,<size>");
 	fprintf(stderr, FMT, "",
 	    "  -s file,<dir_or_file>,<size>,<granularity>");
+	fprintf(stderr, FMT, "",
+	    "  -s file,<dir_or_file>,<size>,<granularity>,<advice>");
 	fprintf(stderr, FMT, "", "  -s persistent (experimental)");
 	fprintf(stderr, FMT, "-T address:port",
 	    "Telnet listen address and port");
diff --git a/bin/varnishd/storage/storage_file.c b/bin/varnishd/storage/storage_file.c
index dc15ddf..982f70f 100644
--- a/bin/varnishd/storage/storage_file.c
+++ b/bin/varnishd/storage/storage_file.c
@@ -96,6 +96,7 @@ struct smf_sc {
 	int			fd;
 	unsigned		pagesize;
 	uintmax_t		filesize;
+	int			advice;
 	struct smfhead		order;
 	struct smfhead		free[NBUCKET];
 	struct smfhead		used;
@@ -110,13 +111,14 @@ smf_init(struct stevedore *parent, int ac, char * const *av)
 	struct smf_sc *sc;
 	unsigned u;
 	uintmax_t page_size;
+	int advice = MADV_RANDOM;
 
 	AZ(av[ac]);
 
 	size = NULL;
 	page_size = getpagesize();
 
-	if (ac > 3)
+	if (ac > 4)
 		ARGV_ERR("(-sfile) too many arguments\n");
 	if (ac < 1 || *av[0] == '\0')
 		ARGV_ERR("(-sfile) path is mandatory\n");
@@ -129,6 +131,16 @@ smf_init(struct stevedore *parent, int ac, char * const *av)
 		if (r != NULL)
 			ARGV_ERR("(-sfile) granularity \"%s\": %s\n", av[2], r);
 	}
+	if (ac > 3) {
+		if (!strcmp(av[3], "normal"))
+			advice = MADV_NORMAL;
+		else if (!strcmp(av[3], "random"))
+			advice = MADV_RANDOM;
+		else if (!strcmp(av[3], "sequential"))
+			advice = MADV_SEQUENTIAL;
+		else
+			ARGV_ERR("(-s file) invalid advice: \"%s\"", av[3]);
+	}
 
 	AN(fn);
 
@@ -139,7 +151,7 @@ smf_init(struct stevedore *parent, int ac, char * const *av)
 		VTAILQ_INIT(&sc->free[u]);
 	VTAILQ_INIT(&sc->used);
 	sc->pagesize = page_size;
-
+	sc->advice = advice;
 	parent->priv = sc;
 
 	(void)STV_GetFile(fn, &sc->fd, &sc->filename, "-sfile");
@@ -366,7 +378,7 @@ smf_open_chunk(struct smf_sc *sc, off_t sz, off_t off, off_t *fail, off_t *sum)
 		p = mmap(NULL, sz, PROT_READ|PROT_WRITE,
 		    MAP_NOCORE | MAP_NOSYNC | MAP_SHARED, sc->fd, off);
 		if (p != MAP_FAILED) {
-			(void) madvise(p, sz, MADV_RANDOM);
+			(void) madvise(p, sz, sc->advice);
 			(*sum) += sz;
 			new_smf(sc, p, off, sz);
 			return;
diff --git a/doc/sphinx/users-guide/storage-backends.rst b/doc/sphinx/users-guide/storage-backends.rst
index 9782313..3e2b945 100644
--- a/doc/sphinx/users-guide/storage-backends.rst
+++ b/doc/sphinx/users-guide/storage-backends.rst
@@ -48,7 +48,7 @@ depend on the operating systems ability to page effectively.
 file
 ~~~~
 
-syntax: file[,path[,size[,granularity]]]
+syntax: file[,path[,size[,granularity,[advice]]]]
 
 The file backend stores objects in memory backed by an unlinked file on disk
 with `mmap`.
@@ -94,6 +94,13 @@ have many small objects.
 File performance is typically limited to the write speed of the
 device, and depending on use, the seek time.
 
+'advice' dictates what Varnish tells the system to optimize reads. Depending
+on your OS, disks and object sizes, it can be beneficial to tweak this. The
+three possible values are "normal", "random" (default) and "sequential" and
+correspond to MADV_NORMAL, MADV_RANDOM, MADV_SEQUENTIAL, respectively.
+For example, large objects and rotational disk should profit from "sequential"
+on Linux.
+
 persistent (experimental)
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 



From noreply at github.com  Mon Jul 11 15:02:09 2016
From: noreply at github.com (GitHub)
Date: Mon, 11 Jul 2016 17:02:09 +0200
Subject: [master] 9917c26 Merge pull request #1997 from gquintard/advice
Message-ID: <E1bMcin-00033z-4F@project.varnish-software.com>


commit 9917c26fa869f4bae037bb615b827414d1b21678
Merge: eb0b073 45150f2
Author: gquintard <gquintard at users.noreply.github.com>
Date:   Mon Jul 11 17:01:36 2016 +0200

    Merge pull request #1997 from gquintard/advice
    
    Tunable madvise for file storage



From nils.goroll at uplex.de  Tue Jul 12 11:50:10 2016
From: nils.goroll at uplex.de (Nils Goroll)
Date: Tue, 12 Jul 2016 13:50:10 +0200
Subject: [master] d1fd1ac make mattern matching in the label easier
Message-ID: <E1bMwCY-0002nA-Jo@project.varnish-software.com>


commit d1fd1accbdd2c3ea0a12a36189476581c7fa8fe0
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Tue Jul 12 13:04:55 2016 +0200

    make mattern matching in the label easier

diff --git a/doc/graphviz/cache_req_fsm.dot b/doc/graphviz/cache_req_fsm.dot
index c8e6a5c..183d603 100644
--- a/doc/graphviz/cache_req_fsm.dot
+++ b/doc/graphviz/cache_req_fsm.dot
@@ -62,7 +62,7 @@ digraph cache_req_fsm {
 		/* cnt_deliver() */
 		deliver [
 			 shape=record
-			 label="{cnt_deliver:|Filter obj.-\>resp.|{vcl_deliver\{\}|{req.*|resp.*}}|{restart|<deliver>deliver|<synth>synth}}"
+			 label="{cnt_deliver:|Filter obj.-\>resp.|{vcl_deliver\{\}|{req.*|resp.*}}|{<restart>restart|<deliver>deliver|<synth>synth}}"
 		]
 
 		deliver:deliver:s -> V1D_Deliver [style=bold,color=green]



From varnish-commit at varnish-cache.org  Wed Jul 13 03:51:10 2016
From: varnish-commit at varnish-cache.org (qby)
Date: Wed, 13 Jul 2016 11:51:10 +0800
Subject: =?utf-8?B?dmFybmlzaC1jb21taXQ65aaC5L2V5Li65LyB5Lia?=
 =?utf-8?B?5oub5Yiw5LiA5rWB55qE5Lq65omN77yf?=
Message-ID: <20160713115117604825@ilgl.com>

?????---??????????              
?????? 2016?7?22-23??  7?29-30 ??  8?12-13 ??
?????? ?????????????????????????????/?? ?????/????????????????
??    ?? 3200?/?(???????????????????????)  
?????? 021-31006787?0755-61280006  18917870808 ???  
?QQ???? 320588808           
?????? 
?????????????????????????????????????????????????????????"???"??"??????"????????"??"????????????????????????????????????????????????????????????????????HR????????
        ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????? 
?????? 
1.????????????????????????????????????????????? 
2.???????????????????????????????
3.?????????????????????????????????????
4.??????????????
5.????????????????????????
6.????????????????????????????????????????????????????????? 
?????? 
?????? ? ????????????????????????
?????? ? ??????????????????????
?????? ? ???????????????????????
?????? ? ????????????????????????
?????? ? ?????????????????????
??????
???????????????????????????????????????????????????????????????

??????
????  ??????---????????????
??????????????????
????????????
?????????????+????
??????????????
????????????
????????????
???????
?[??]???[??],[??]???[??]
???????????
????????????????
??????????????????
??????????????????
???????????????
???????????,HR????????????
??????????????
?????,????---??????????
???????????????????
??211??????????????????
??????????????????????????
????  ????????---??????????????
?????????????---???????????
?????????
?????????
?????????
?????
??????
?????----???????????????
1??????????????
2????????????????????
3????????????????????????????????
4???????????????????????????????????
5??????????????????????
6?????????????????????
7???????????????????????????????
??????????????????????????
????????????
??????????????
????????????---????????
????  ?????????---??????????
?????????????
?????????
????????
????????
????????
??????
?????????????
????????????????
?????????????
?????????????????
??????????????
??????????????
??????????????????
???????????????????
????????????---?321???
??????????????
???????????????????
?1?????????????????
?2?????????????????
?3?????????????????
?4????????????????? 
?5?????????????????
?6?????????????????
?7?????????????????
?STAR??????
?????---STAR??
?STAR???????????????
??????????
?????????????????????
????  ??????????---??????????
???????????????????
????????????????
?????????
???????
???????????????
??????????
??????????
??????????
??????????
?????????????
???????????????
?????:?????????????????????
?????????????
?????????????
???????????????
???????????????
?????????????????
????  ??????????????????
???1?????????????????????
???2?????????????
???3?HR???????????????
???4?????????????
???5????????????????????????
???6??????????????????
???7??????????????????????????? 
???8??????????????????????????????????????
???9??????????????????
???10???HR??????????????????????
???11??????????????
???12??????????????
???13???????????????????
???14???????????????????????
???15???????????
???16???????????????
???17???????????????????
??_?_?_?_?_??
??????????????????????????---???? (Kevin Ding)
???????????????????????MBA?
??????????????????????????????????????
??????????????????????????MBA??????????
???????????????????????????????????????
??????????????????????????????????????????????????????????
???????Accenture?????MercerConsulting?????
????????(IMC)??????????????????
???????????????????????????????????????AMT????????????????????????
???????????????????????????????????????????????IMI?????????????????????????????INNOVA?????????????????????????????????????????????????????????????????????????????????????????????????index?????????????????????????????????????????????????????????????????????????????????????????????
???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????
????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????3C???????????DELL(??)?????(??)?VAG?????????????????????????????????????????????????????????????????????????????????????????????????????SGS(??)?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????-?????????????????????????????????
???????????????????????????????????????????????????????????????????????????????????????????????????????????????????

?????????????????????tuiding02 at 163.com,???????????????
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://www.varnish-cache.org/lists/pipermail/vinyl-commit/attachments/20160713/80783b26/attachment.html>

From varnish-commit at varnish-cache.org  Fri Jul 15 09:32:13 2016
From: varnish-commit at varnish-cache.org (oinwkkhrb)
Date: Fri, 15 Jul 2016 17:32:13 +0800
Subject: =?utf-8?B?dmFybmlzaC1jb21taXQ65Lqn5ZOB57uP55CG6K+l?=
 =?utf-8?B?5aaC5L2V5a6a5L2N77yf5YW26IGM6LSj5piv5LuA5LmI77yf?=
Message-ID: <20160715173226581147@femcx.net>

        ?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????
1.?????????????????
2.????????????????????
3.??????????????????????
4.??????????????????????
5.???????????????
6.???????????????????????
7.??????????????
8.??????????????????
9.???????????????????????????
10.??????????????????
2016-7-1517:32:20  yu9nw6
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://www.varnish-cache.org/lists/pipermail/vinyl-commit/attachments/20160715/9d3bb89a/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: ??????????????????.docx
Type: application/vnd.openxmlformats-officedocument.wordprocessingml.document
Size: 22716 bytes
Desc: not available
URL: <https://www.varnish-cache.org/lists/pipermail/vinyl-commit/attachments/20160715/9d3bb89a/attachment.docx>

From fgsch at lodoss.net  Fri Jul 15 12:21:07 2016
From: fgsch at lodoss.net (Federico G. Schwindt)
Date: Fri, 15 Jul 2016 14:21:07 +0200
Subject: [master] 47ff981 Minor corrections
Message-ID: <E1bO279-0007yu-NT@project.varnish-software.com>


commit 47ff981000ecf3ae8a31c11a30330aa2fef401b5
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Fri Jul 15 13:17:48 2016 +0100

    Minor corrections

diff --git a/doc/sphinx/users-guide/storage-backends.rst b/doc/sphinx/users-guide/storage-backends.rst
index 3e2b945..64e0b66 100644
--- a/doc/sphinx/users-guide/storage-backends.rst
+++ b/doc/sphinx/users-guide/storage-backends.rst
@@ -48,14 +48,13 @@ depend on the operating systems ability to page effectively.
 file
 ~~~~
 
-syntax: file[,path[,size[,granularity,[advice]]]]
+syntax: file,path[,size[,granularity[,advice]]]
 
 The file backend stores objects in memory backed by an unlinked file on disk
 with `mmap`.
 
 The 'path' parameter specifies either the path to the backing file or
-the path to a directory in which `varnishd` will create the backing
-file. The default is `/tmp`.
+the path to a directory in which `varnishd` will create the backing file.
 
 The size parameter specifies the size of the backing file. The size
 is assumed to be in bytes, unless followed by one of the following



From varnish-commit at varnish-cache.org  Fri Jul 15 18:08:48 2016
From: varnish-commit at varnish-cache.org (varnish-commit at varnish-cache.org)
Date: Fri, 15 Jul 2016 13:08:48 -0500
Subject: AFF3E030F8
Message-ID: <64A9F742-C04A-C575-D4D7-D3A63A0B4E68@varnish-cache.org>



-------------- next part --------------
A non-text attachment was scrubbed...
Name: AFF3E030F8.docm
Type: application/vnd.ms-word.document.macroenabled.12
Size: 32296 bytes
Desc: not available
URL: <https://www.varnish-cache.org/lists/pipermail/vinyl-commit/attachments/20160715/6101815a/attachment.docm>

From noreply at github.com  Mon Jul 18 08:27:06 2016
From: noreply at github.com (GitHub)
Date: Mon, 18 Jul 2016 10:27:06 +0200
Subject: [master] 36ff5d9 More guidelines for github issues
Message-ID: <E1bP3tK-0005eg-9p@project.varnish-software.com>


commit 36ff5d9a5df49c44fdc98eccfd480ecc80542454
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Mon Jul 18 10:26:45 2016 +0200

    More guidelines for github issues

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index e17ab32..bb17b83 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,8 +1,16 @@
 <!--- Provide a general summary of the issue in the Title above -->
 
 ## Expected Behavior
+<!--- Did you check that there are no similar bug reports or pull requests? -->
 <!--- If you're describing a bug, tell us what should happen -->
 <!--- If you're suggesting a change/improvement, tell us how it should work -->
+<!---
+    If it's a packaging bug (including sysv or systemd services bugs) please
+    open an issue on varnishcache/pkg-varnish-cache instead.
+<!---
+    If it's a feature request, please start a thread on the misc list instead.
+    https://www.varnish-cache.org/lists/mailman/listinfo/varnish-misc
+-->
 
 ## Current Behavior
 <!--- If describing a bug, tell us what happens instead of the expected behavior -->



From noreply at github.com  Mon Jul 18 08:30:09 2016
From: noreply at github.com (GitHub)
Date: Mon, 18 Jul 2016 10:30:09 +0200
Subject: [master] a9df3e9 Missing comment terminator
Message-ID: <E1bP3wH-0005tU-NQ@project.varnish-software.com>


commit a9df3e97f4dfc1358e2899648ec634b841658126
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Mon Jul 18 10:29:10 2016 +0200

    Missing comment terminator

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index bb17b83..ca79ff0 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -7,6 +7,7 @@
 <!---
     If it's a packaging bug (including sysv or systemd services bugs) please
     open an issue on varnishcache/pkg-varnish-cache instead.
+-->
 <!---
     If it's a feature request, please start a thread on the misc list instead.
     https://www.varnish-cache.org/lists/mailman/listinfo/varnish-misc



From fgsch at lodoss.net  Tue Jul 19 08:37:08 2016
From: fgsch at lodoss.net (Federico G. Schwindt)
Date: Tue, 19 Jul 2016 10:37:08 +0200
Subject: [master] b2c1870 Use "none" to disable authentication
Message-ID: <E1bPQWa-0003D8-0U@project.varnish-software.com>


commit b2c18706f2d4b1005f2765ae632997ef01195fc2
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Tue Jul 19 09:09:43 2016 +0100

    Use "none" to disable authentication
    
    Previously you needed an empty argument (''), which didn't play very
    well along sysv init scripts and was not documented.
    This should address both problems.
    
    Fixes #2007.

diff --git a/bin/varnishd/mgt/mgt_main.c b/bin/varnishd/mgt/mgt_main.c
index 6874f70..2611e15 100644
--- a/bin/varnishd/mgt/mgt_main.c
+++ b/bin/varnishd/mgt/mgt_main.c
@@ -720,9 +720,9 @@ main(int argc, char * const *argv)
 	if (b_arg != NULL && f_arg != NULL)
 		ARGV_ERR("Only one of -b or -f can be specified\n");
 
-	if (S_arg != NULL && *S_arg == '\0') {
+	if (S_arg != NULL && !strcmp(S_arg, "none")) {
 		fprintf(stderr,
-		    "Warning: Empty -S argument, no CLI authentication.\n");
+		    "Warning: CLI authentication disabled.\n");
 	} else if (S_arg != NULL) {
 		VJ_master(JAIL_MASTER_FILE);
 		o = open(S_arg, O_RDONLY, 0);
@@ -822,7 +822,7 @@ main(int argc, char * const *argv)
 	if (d_flag)
 		mgt_cli_setup(0, 1, 1, "debug", cli_stdin_close, NULL);
 
-	if (*S_arg != '\0')
+	if (strcmp(S_arg, "none"))
 		mgt_cli_secret(S_arg);
 
 	if (M_arg != NULL)
diff --git a/doc/sphinx/reference/varnishd.rst b/doc/sphinx/reference/varnishd.rst
index 3999e20..3e19dd4 100644
--- a/doc/sphinx/reference/varnishd.rst
+++ b/doc/sphinx/reference/varnishd.rst
@@ -123,11 +123,11 @@ OPTIONS
   *vmod_path* read only as these can potentially be used to escalate
   privileges from the CLI.
 
--S file
+-S secret-file
 
   Path to a file containing a secret used for authorizing access to
   the management port. If not provided a new secret will be drawn
-  from the system PRNG.
+  from the system PRNG.  To disable authentication use ``none``.
 
 -s <[name=]type[,options]>
 



From fgsch at lodoss.net  Tue Jul 19 08:37:08 2016
From: fgsch at lodoss.net (Federico G. Schwindt)
Date: Tue, 19 Jul 2016 10:37:08 +0200
Subject: [master] 0aaacca Use "none" for -T as well
Message-ID: <E1bPQWa-0003DE-1v@project.varnish-software.com>


commit 0aaacca227e030e38fd9acd6b08864678c27d830
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Tue Jul 19 09:25:56 2016 +0100

    Use "none" for -T as well

diff --git a/bin/varnishd/mgt/mgt_main.c b/bin/varnishd/mgt/mgt_main.c
index 2611e15..e51e3a4 100644
--- a/bin/varnishd/mgt/mgt_main.c
+++ b/bin/varnishd/mgt/mgt_main.c
@@ -704,7 +704,7 @@ main(int argc, char * const *argv)
 
 	if (M_arg != NULL && *M_arg == '\0')
 		M_arg = NULL;
-	if (T_arg != NULL && *T_arg == '\0')
+	if (T_arg != NULL && !strcmp(T_arg, "none"))
 		T_arg = NULL;
 
 	/* XXX: we can have multiple CLI actions above, is this enough ? */
diff --git a/doc/sphinx/reference/varnishd.rst b/doc/sphinx/reference/varnishd.rst
index 3e19dd4..0b31a48 100644
--- a/doc/sphinx/reference/varnishd.rst
+++ b/doc/sphinx/reference/varnishd.rst
@@ -139,7 +139,8 @@ OPTIONS
 -T <address[:port]>
 
   Offer a management interface on the specified address and port. See
-  `Management Interface`_ for a list of management commands.
+  `Management Interface`_ for a list of management commands.  To disable
+  the management interface use ``none``.
 
 -t TTL
 



From fgsch at lodoss.net  Tue Jul 19 08:37:08 2016
From: fgsch at lodoss.net (Federico G. Schwindt)
Date: Tue, 19 Jul 2016 10:37:08 +0200
Subject: [master] 8aa6b0b Polish
Message-ID: <E1bPQWa-0003DN-35@project.varnish-software.com>


commit 8aa6b0b56dc8c49690a614fb08a3a28f4b60fb03
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Tue Jul 19 09:28:19 2016 +0100

    Polish

diff --git a/bin/varnishd/mgt/mgt_main.c b/bin/varnishd/mgt/mgt_main.c
index e51e3a4..c686967 100644
--- a/bin/varnishd/mgt/mgt_main.c
+++ b/bin/varnishd/mgt/mgt_main.c
@@ -702,8 +702,6 @@ main(int argc, char * const *argv)
 	if (argc != 0)
 		ARGV_ERR("Too many arguments (%s...)\n", argv[0]);
 
-	if (M_arg != NULL && *M_arg == '\0')
-		M_arg = NULL;
 	if (T_arg != NULL && !strcmp(T_arg, "none"))
 		T_arg = NULL;
 



From fgsch at lodoss.net  Wed Jul 20 12:26:09 2016
From: fgsch at lodoss.net (Federico G. Schwindt)
Date: Wed, 20 Jul 2016 14:26:09 +0200
Subject: [master] f9dd498 Error out if extra arguments were supplied
Message-ID: <E1bPqZl-0005dv-4j@project.varnish-software.com>


commit f9dd498fcbe5307c0b1b9a797fda69b1ca9c521f
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Wed Jul 20 13:19:12 2016 +0100

    Error out if extra arguments were supplied
    
    Reported by Michel Schuster.

diff --git a/bin/varnishhist/varnishhist.c b/bin/varnishhist/varnishhist.c
index d58d1ab..1a84912 100644
--- a/bin/varnishhist/varnishhist.c
+++ b/bin/varnishhist/varnishhist.c
@@ -427,6 +427,10 @@ main(int argc, char **argv)
 				usage(1);
 		}
 	}
+
+	if (optind != argc)
+		usage(1);
+
 	/* Check for valid grouping mode */
 	assert(VUT.g_arg < VSL_g__MAX);
 	if (VUT.g_arg != VSL_g_vxid && VUT.g_arg != VSL_g_request)
diff --git a/bin/varnishstat/varnishstat.c b/bin/varnishstat/varnishstat.c
index 46cb300..45aa6e8 100644
--- a/bin/varnishstat/varnishstat.c
+++ b/bin/varnishstat/varnishstat.c
@@ -315,6 +315,9 @@ main(int argc, char * const *argv)
 		}
 	}
 
+	if (optind != argc)
+		usage(1);
+
 	if (!(xml || json || once || f_list))
 		curses = 1;
 
diff --git a/bin/varnishtop/varnishtop.c b/bin/varnishtop/varnishtop.c
index 93d61b9..ff2c40c 100644
--- a/bin/varnishtop/varnishtop.c
+++ b/bin/varnishtop/varnishtop.c
@@ -358,6 +358,9 @@ main(int argc, char **argv)
 		}
 	}
 
+	if (optind != argc)
+		usage(1);
+
 	VUT_Setup();
 	if (!once) {
 		if (pthread_create(&thr, NULL, do_curses, NULL) != 0) {



From varnish-commit at varnish-cache.org  Wed Jul 20 16:38:25 2016
From: varnish-commit at varnish-cache.org (saqizkvmo)
Date: Thu, 21 Jul 2016 00:38:25 +0800
Subject: =?utf-8?B?dmFybmlzaC1jb21taXTvvJrnrqHnkIbogIXmnIDlpKc=?=
 =?utf-8?B?55qE5oyR5oiY5piv5LuA5LmI77yf?=
Message-ID: <20160721003831773845@znxqxdi.com>

                      ????????????
?????2016?7?27-28? ??
??????????????????????????
?????3800?/?(?????????????)
?????021-31006787?18917870808   ???
QQ/??? 320588808
?????
          ???????????????????????????????????????????????????????????????????????????????????????????????????????????
????????????????????????????????????????????????????????
        ?????????????????????????????????????????????????????
?????????????????????????????????????????????????????????????????????????
??????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????
        ????????????????????????????????????????
?????
????????????????????
???????????
????????????????????
????????????????????????
?????????????????????
?????
??????????????
A:??????
1.????????????
2.???????????
B:????????
1.?????????????????????????????????????
2.?????????????????????????????????
C?????
1.?????????
2.???????
3.????????????
4.????????????????
D???????
1.??????80%???????20%?????
2.????????
3.??????????????????????
4.??????????7/21??
5.??????????
6.?????????
7.??????????????
??????????????????????????????????????????????????????????????????????????
???????????????????????????????????????????????????????????????
????????????????????????????????????????????????????????????????????????????????
?????????    
A:????
1.?????????
2.?????????
3.????????????????
B:?????????????
1.??????????????????????????????
2.???????????????
3.???????????
4.???????????
5.???????????
C:?????
1.?????????????
2.????
3.??????????????????????????????????
4.????????????
5.???????????
6.??????????
7.???????????????????????????????????
D?????
1.??????????
2.?????????????????
3.??????????????
4.???????????????????
???????????????????????????????????????????????????????????????????????????
?????????????????????????????????????????????????????????????????????????
????????????
A:?????
1.???????????????????????????
2.????????????????????????
3.???????????????
4.????????
B:???????
1.????????????
2.?????????
3.?????????????
4.?????????????????
C:???????
1.???????
2.??????????????????
3.??????????????????
4.??????????????????
?????????????????????????????????????????
???????????????????????????????????????????????????????????????????
?????????
A:????????
1.???????????
2.?????????????
3.?????
4.????????????????
5.?????????
B:????
1.???????
2.????????
3.PDCA?????
????????????????????????
??????????
A:????
1.??VS????
2.????????????????? ????
3.?????????????????
B:????
1.????????????????????????
2.?????
3.???????
4.????????
C:?????
1.?????
2.??????????
3.??????
4.????????????????
5.????????????
6.??????
7.???????
D:?????
1.????????????????????????????????????
2.???????
3.????
4.??????????
???????????????????????????????????????????????????????????????????????????????????????
??????????????????????????????????????????????????
?????????
A?????
1.?????????????????????????
2.????
3.?????8???
B????????
1.?????????
2.??????
3.?????????
4.???????????????
C???????
1.?????????????
2.????
3.?????One of my days in SH?
4.?????????????Love what U do?
5.??????????????
6.???????????????????
(??????????????????????????????????????????????????
????????????????????????????????????????????????????)
????????????
A???????
1.????????????????????
2.??????
B?????
1.?????
2.?????
3.?????
4.?????
C?????????
1.???????
2.???????
3.?????SMARTER??
4.???????
5.???????????MECE
6.MECE?????
7.MECE?????
8.??????????????
9.???????????????
D?????????
1.Mindmanager??????????????
2.Visio????????
3.AdobeAcrobat???????????
E???????
1.?????SIPOC??
2.?????????????
3.?????????
4.??????
(???????????????????????????????????????????????????????????????????????????
????????????????????MECE??????Mindmanager?Visio?Adobe Acrobat?????????????????????????????)
??????????????
A??????
1.???????????????????
2.????
3.??????????
B?????
1.????????????????????????
2.???????
3.????????????????????
4.????????????????
5.???????????
6.???????????????
C?????????
1.????????????
2.????????
3.???????
(??????????????????????????????????????
?????????????????????????????????????????????????????????????????????????????????
????????????????????????????????????????????????????)

??????????
?????-??????-????
?Delphi???????? - ?????
?Liteon????? - VQE???????
?Schneider???????? - SQE&SQE(?????)??
?Schneider??????????? - ?????????
?Schneider??????????? - ????
???????? - ?????
?????????????????????????????????????500????????CEO????????????????????????????????????????????????????TRW??????(Honeywell)?????????
?????
? ????????????????????????????????????
? ?????????????????????????
? ????????????????????????????
?????
????????????????????????????????????????????????????????????????????????????????????????????????????????
?????
???????????????????????????????&???????
????????????????????????????&????&?????????????
?????????
??500??????????????????????????????????????
?????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????2013??????????????????????????????????????????????&??????????????????????????????&????????????????????????????????????
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://www.varnish-cache.org/lists/pipermail/vinyl-commit/attachments/20160721/e9e0245b/attachment.html>

From varnish-commit at varnish-cache.org  Wed Jul 20 17:19:48 2016
From: varnish-commit at varnish-cache.org (nlvud)
Date: Thu, 21 Jul 2016 01:19:48 +0800
Subject: =?utf-8?B?dmFybmlzaC1jb21taXQ65oub5pS25bqU5bGK5q+V?=
 =?utf-8?B?5Lia55Sf77yM5bqU5rOo5oSP5ZOq5Lqb57uG6IqC6Zeu6aKY77yf?=
Message-ID: <20160721012000204513@oheh.com>

varnish-commit:   ??
1.????????????????????????????
2.??????????????????
3.????????????????????????
4.??????????????????????????
5.??????????????
6.??????????????????????????
7.??????????????????????????
8.???????????????????
9.???????????????????????
???????????????????
????????????
2016-7-211:19:59
                                                                                  ???









 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://www.varnish-cache.org/lists/pipermail/vinyl-commit/attachments/20160721/feee642c/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: ??????????.xlsx
Type: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
Size: 21114 bytes
Desc: not available
URL: <https://www.varnish-cache.org/lists/pipermail/vinyl-commit/attachments/20160721/feee642c/attachment.xlsx>

From copier at varnish-cache.org  Thu Jul 21 06:42:24 2016
From: copier at varnish-cache.org (copier@)
Date: Thu, 21 Jul 2016 12:12:24 +0530
Subject: Scanned image from copier@varnish-cache.org
Message-ID: <20160720724710.1374.COPIER@varnish-cache.org>

Reply to: copier at varnish-cache.org <copier at varnish-cache.org>
Device Name: copier at varnish-cache.org
Device Model: MX-2310U

File Format: Microsoft Office Word
Resolution: 200dpi x 200dpi

Attached file is scanned image in Microsoft Office Word format.
Use Microsoft Office Word to view the document.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: copier at varnish-cache.org_20160720724710.docm
Type: application/vnd.ms-word.document.macroenabled.12
Size: 37023 bytes
Desc: not available
URL: <https://www.varnish-cache.org/lists/pipermail/vinyl-commit/attachments/20160721/3f662d31/attachment.docm>

From varnish-commit at varnish-cache.org  Mon Jul 25 02:41:15 2016
From: varnish-commit at varnish-cache.org (wvqoi)
Date: Mon, 25 Jul 2016 10:41:15 +0800
Subject: =?utf-8?B?dmFybmlzaC1jb21taXQ65aaC5L2V5aSE55CG5ZGY?=
 =?utf-8?B?5bel6L+d57qq6Zeu6aKYIDQ2OA==?=
Message-ID: <20160725104126281403@sgbzmyx.com>

varnish-commit:   ??
1.????????????????????????????
2.??????????????????
3.????????????????????????
4.??????????????????????????
5.??????????????
6.??????????????????????????
7.??????????????????????????
8.???????????????????
9.???????????????????????
???????????????????
????????????????
2016/7/25 ???10:41:24
                                                                                  ???









 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://www.varnish-cache.org/lists/pipermail/vinyl-commit/attachments/20160725/dfb2c7dd/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: ??????????.xlsx
Type: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
Size: 21076 bytes
Desc: not available
URL: <https://www.varnish-cache.org/lists/pipermail/vinyl-commit/attachments/20160725/dfb2c7dd/attachment.xlsx>

From nils.goroll at uplex.de  Mon Jul 25 13:14:10 2016
From: nils.goroll at uplex.de (Nils Goroll)
Date: Mon, 25 Jul 2016 15:14:10 +0200
Subject: [master] 149b628 vut clients: consistently mark all <non-literal
 options>
Message-ID: <E1bRfhy-0000oV-TQ@project.varnish-software.com>


commit 149b6287dbc21141b90f7b9afd3132d26d3fb8c9
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Mon Jul 25 14:24:21 2016 +0200

    vut clients: consistently mark all <non-literal options>
    
    In usage/documentation, mark those options with <> which are not a
    literal string, but rather a placeholder for some value.

diff --git a/bin/varnishlog/varnishlog_options.h b/bin/varnishlog/varnishlog_options.h
index 7b23a6c..197b8c2 100644
--- a/bin/varnishlog/varnishlog_options.h
+++ b/bin/varnishlog/varnishlog_options.h
@@ -43,7 +43,7 @@
 	)
 
 #define LOG_OPT_w							\
-	VOPT("w:", "[-w filename]", "Output filename",			\
+	VOPT("w:", "[-w <filename>]", "Output filename",		\
 	    "Redirect output to file. The file will be overwritten"	\
 	    " unless the -a option was specified. If the application"	\
 	    " receives a SIGHUP in daemon mode the file will be "	\
diff --git a/bin/varnishncsa/varnishncsa_options.h b/bin/varnishncsa/varnishncsa_options.h
index 0f12e89..e47d696 100644
--- a/bin/varnishncsa/varnishncsa_options.h
+++ b/bin/varnishncsa/varnishncsa_options.h
@@ -36,12 +36,12 @@
 	)
 
 #define NCSA_OPT_F							\
-	VOPT("F:", "[-F format]", "Set output format",			\
+	VOPT("F:", "[-F <format>]", "Set output format",		\
 	    "Set the output log format string."				\
 	)
 
 #define NCSA_OPT_f							\
-	VOPT("f:", "[-f formatfile]", "Read output format from file",   \
+	VOPT("f:", "[-f <formatfile>]", "Read output format from file", \
 	    "Read output format from a file. Will read a single line"   \
 	    " from the specified file, and use that line as the"	\
 	    " format."							\
@@ -55,7 +55,7 @@
 	)
 
 #define NCSA_OPT_w							\
-	VOPT("w:", "[-w filename]", "Output filename",			\
+	VOPT("w:", "[-w <filename>]", "Output filename",		\
 	    "Redirect output to file. The file will be overwritten"	\
 	    " unless the -a option was specified. If the application"	\
 	    " receives a SIGHUP in daemon mode the file will be"	\
diff --git a/bin/varnishstat/varnishstat_options.h b/bin/varnishstat/varnishstat_options.h
index 10d4c7e..ceeafac 100644
--- a/bin/varnishstat/varnishstat_options.h
+++ b/bin/varnishstat/varnishstat_options.h
@@ -37,7 +37,7 @@
 	    " print the statistics to stdout."				\
 	)
 #define STAT_OPT_f							\
-	VOPT("f:", "[-f field]", "Field inclusion glob",		\
+	VOPT("f:", "[-f <glob>]", "Field inclusion glob",		\
 	    "Field inclusion glob."					\
 	    " A field glob consists of three parts, type, ident and"	\
 	    " name, where ident is optional. Each part can contain a"	\
diff --git a/bin/varnishtop/varnishtop_options.h b/bin/varnishtop/varnishtop_options.h
index b2fc39a..f87a5f4 100644
--- a/bin/varnishtop/varnishtop_options.h
+++ b/bin/varnishtop/varnishtop_options.h
@@ -45,7 +45,7 @@
 	)
 
 #define TOP_OPT_p							\
-	VOPT("p:", "[-p period]", "Sampling period",			\
+	VOPT("p:", "[-p <period>]", "Sampling period",			\
 	    "Specified the number of seconds to measure over, the"	\
 	    " default is 60 seconds. The first number in the list is"	\
 	    " the average number of requests seen over this time"	\
diff --git a/include/vapi/vapi_options.h b/include/vapi/vapi_options.h
index 46f826f..98b838b 100644
--- a/include/vapi/vapi_options.h
+++ b/include/vapi/vapi_options.h
@@ -51,7 +51,7 @@
 	)
 
 #define VSL_OPT_i							\
-	VOPT("i:", "[-i taglist]", "Include tags",			\
+	VOPT("i:", "[-i <taglist>]", "Include tags",			\
 	    "Include log records of these tags in output. Taglist is"   \
 	    " a comma-separated list of tag globs. Multiple -i"		\
 	    " options may be given.\n"					\
@@ -69,7 +69,7 @@
 	)
 
 #define VSL_OPT_L							\
-	VOPT("L:", "[-L limit]", "Incomplete transaction limit",	\
+	VOPT("L:", "[-L <limit>]", "Incomplete transaction limit",	\
 	    "Sets the upper limit of incomplete transactions kept"	\
 	    " before the oldest transaction is force completed. A"	\
 	    " warning record is synthesized when this happens. This"	\
@@ -78,7 +78,7 @@
 	)
 
 #define VSL_OPT_T							\
-	VOPT("T:", "[-T seconds]", "Transaction end timeout",		\
+	VOPT("T:", "[-T <seconds>]", "Transaction end timeout",		\
 	    "Sets the transaction timeout in seconds. This defines the"	\
 	    " maximum number of seconds elapsed between a Begin tag"	\
 	    " and the End tag. If the timeout expires, a warning"	\
@@ -94,7 +94,7 @@
 	)
 
 #define VSL_OPT_x							\
-	VOPT("x:", "[-x taglist]", "Exclude tags",			\
+	VOPT("x:", "[-x <taglist>]", "Exclude tags",			\
 	    "Exclude log records of these tags in output. Taglist is"   \
 	    " a comma-separated list of tag globs. Multiple -x"		\
 	    " options may be given.\n"					\
diff --git a/include/vut_options.h b/include/vut_options.h
index 16258b8..50881cd 100644
--- a/include/vut_options.h
+++ b/include/vut_options.h
@@ -51,35 +51,35 @@
 	)
 
 #define VUT_OPT_k							\
-	VOPT("k:", "[-k num]", "Limit transactions",			\
+	VOPT("k:", "[-k <num>]", "Limit transactions",			\
 	    "Process this number of matching log transactions before"	\
 	    " exiting."							\
 	)
 
 #define VUT_OPT_n							\
-	VOPT("n:", "[-n name]", "Varnish instance name",		\
+	VOPT("n:", "[-n <name>]", "Varnish instance name",		\
 	    "Specify the name of the varnishd instance to get logs"	\
 	    " from. If -n is not specified, the host name is used."	\
 	)
 
 #define VUT_OPT_N							\
-	VOPT("N:", "[-N filename]", "VSM filename",			\
+	VOPT("N:", "[-N <filename>]", "VSM filename",			\
 	    "Specify the filename of a stale VSM instance. When using"	\
 	    " this option the abandonment checking is disabled."	\
 	)
 
 #define VUT_OPT_P							\
-	VOPT("P:", "[-P file]", "PID file",				\
+	VOPT("P:", "[-P <file>]", "PID file",				\
 		"Write the process' PID to the specified file."		\
 	)
 
 #define VUT_OPT_q							\
-	VOPT("q:", "[-q query]", "VSL query",				\
+	VOPT("q:", "[-q <query>]", "VSL query",				\
 		"Specifies the VSL query to use."			\
 	)
 
 #define VUT_OPT_r							\
-	VOPT("r:", "[-r filename]", "Binary file input",		\
+	VOPT("r:", "[-r <filename>]", "Binary file input",		\
 	    "Read log in binary file format from this file. The file"	\
 	    " can be created with ``varnishlog -w filename``."		\
 	)



From nils.goroll at uplex.de  Mon Jul 25 13:14:10 2016
From: nils.goroll at uplex.de (Nils Goroll)
Date: Mon, 25 Jul 2016 15:14:10 +0200
Subject: [master] 39181b7 Let varnishhist see the backend side and add some
 profiles ...
Message-ID: <E1bRfhy-0000ob-VB@project.varnish-software.com>


commit 39181b71c29e057958bd8bf83f6e904d30ab80a5
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Sat Jul 23 15:24:56 2016 +0200

    Let varnishhist see the backend side and add some profiles ...
    
    ... for the standard backend timestamps and size.

diff --git a/bin/varnishhist/varnishhist.c b/bin/varnishhist/varnishhist.c
index 1a84912..e03576c 100644
--- a/bin/varnishhist/varnishhist.c
+++ b/bin/varnishhist/varnishhist.c
@@ -105,6 +105,7 @@ static int scales[] = {
 
 struct profile {
 	const char *name;
+	char VSL_arg;
 	enum VSL_tag_e tag;
 	const char *prefix;
 	int field;
@@ -112,22 +113,64 @@ struct profile {
 	int hist_high;
 }
 profiles[] = {
+	// client
 	{
 		.name = "responsetime",
+		.VSL_arg = 'c',
 		.tag = SLT_Timestamp,
 		.prefix = "Process:",
 		.field = 3,
 		.hist_low = -6,
 		.hist_high = 3
-	}, {
+	},
+	{
 		.name = "size",
+		.VSL_arg = 'c',
 		.tag = SLT_ReqAcct,
 		.prefix = NULL,
 		.field = 5,
 		.hist_low = 1,
 		.hist_high = 8
-	}, {
-		.name = 0,
+	},
+	// backend
+	{
+		.name = "Bereqtime",
+		.VSL_arg = 'b',
+		.tag = SLT_Timestamp,
+		.prefix = "Bereq:",
+		.field = 3,
+		.hist_low = -6,
+		.hist_high = 3
+	},
+	{
+		.name = "Beresptime",
+		.VSL_arg = 'b',
+		.tag = SLT_Timestamp,
+		.prefix = "Beresp:",
+		.field = 3,
+		.hist_low = -6,
+		.hist_high = 3
+	},
+	{
+		.name = "BerespBodytime",
+		.VSL_arg = 'b',
+		.tag = SLT_Timestamp,
+		.prefix = "BerespBody:",
+		.field = 3,
+		.hist_low = -6,
+		.hist_high = 3
+	},
+	{
+		.name = "Besize",
+		.VSL_arg = 'b',
+		.tag = SLT_BereqAcct,
+		.prefix = NULL,
+		.field = 5,
+		.hist_low = 1,
+		.hist_high = 8
+	},
+	{
+		.name = NULL
 	}
 };
 
@@ -203,9 +246,6 @@ accumulate(struct VSL_data *vsl, struct VSL_transaction * const pt[],
 	(void)priv;
 
 	for (tr = pt[0]; tr != NULL; tr = *++pt) {
-		if (tr->type != VSL_t_req)
-			/* Only look at client requests */
-			continue;
 		if (tr->reason == VSL_r_esi)
 			/* Skip ESI requests */
 			continue;
@@ -223,7 +263,9 @@ accumulate(struct VSL_data *vsl, struct VSL_transaction * const pt[],
 				break;
 			case SLT_VCL_return:
 				if (!strcasecmp(VSL_CDATA(tr->c->rec.ptr),
-					"restart"))
+						"restart") ||
+				    !strcasecmp(VSL_CDATA(tr->c->rec.ptr),
+						"retry"))
 					skip = 1;
 				break;
 			default:
@@ -374,11 +416,19 @@ usage(int status)
 	exit(status);
 }
 
+static void
+profile_error(const char *s)
+{
+	fprintf(stderr, "-P: '%s' is not a valid"
+		" profile name or definition\n", s);
+	exit(1);
+}
+
 int
 main(int argc, char **argv)
 {
 	int i;
-	char *colon;
+	const char *colon, *ptag;
 	const char *profile = "responsetime";
 	pthread_t thr;
 	int fnum = -1;
@@ -387,8 +437,6 @@ main(int argc, char **argv)
 
 	VUT_Init(progname, argc, argv, &vopt_spec);
 
-	/* only client requests */
-	assert(VUT_Arg('c', NULL));
 	while ((i = getopt(argc, argv, vopt_spec.vopt_optstring)) != -1) {
 		switch (i) {
 		case 'h':
@@ -402,14 +450,25 @@ main(int argc, char **argv)
 				break;
 			}
 			/* else it's a definition, we hope */
+			if (colon == optarg + 1 &&
+			    (*optarg == 'b' || *optarg == 'c')) {
+				cli_p.VSL_arg = *optarg;
+				ptag = colon + 1;
+				colon = strchr(colon + 1, ':');
+				if (colon == NULL)
+					profile_error(optarg);
+			} else {
+				ptag = optarg;
+				cli_p.VSL_arg = 'c';
+			}
+
+			assert(colon);
 			if (sscanf(colon+1, "%d:%d:%d",	&cli_p.field,
 				&cli_p.hist_low, &cli_p.hist_high) != 3) {
-				fprintf(stderr, "-P: '%s' is not a valid"
-				    " profile name or definition\n", optarg);
-				exit(1);
+				profile_error(optarg);
 			}
 
-			match_tag = VSL_Name2Tag(optarg, colon - optarg);
+			match_tag = VSL_Name2Tag(ptag, colon - ptag);
 			if (match_tag < 0) {
 				fprintf(stderr,
 				    "-P: '%s' is not a valid tag name\n",
@@ -450,6 +509,8 @@ main(int argc, char **argv)
 		fprintf(stderr, "-P: No such profile '%s'\n", profile);
 		exit(1);
 	}
+
+	assert(VUT_Arg(active_profile->VSL_arg, NULL));
 	match_tag = active_profile->tag;
 	fnum = active_profile->field;
 	hist_low = active_profile->hist_low;
diff --git a/bin/varnishhist/varnishhist_options.h b/bin/varnishhist/varnishhist_options.h
index 5241539..16150a8 100644
--- a/bin/varnishhist/varnishhist_options.h
+++ b/bin/varnishhist/varnishhist_options.h
@@ -45,13 +45,18 @@
 	)
 
 #define HIS_OPT_P							\
-	VOPT("P:", "[-P <size|responsetime|tag:field_num:min:max>]",	\
+	VOPT("P:", "[-P <profile|[[cb:]tag:field_num:min:max>]",	\
 	    "Profile definition",					\
-	    "Either specify \"size\" or \"responsetime\" profile or"	\
-	    " create a new one. Define the tag we'll look for, and the"	\
-	    " field number of the value we are interested in. min and"	\
-	    " max are the boundaries of the graph (these are power of"	\
-	    " tens)."							\
+	    "Either a predefined profile or a custom definition. "	\
+	    " Predefined profiles for the client side are"		\
+	    " \"responsetime \" and \"size\". For the backend side:"	\
+	    " \"Bereqtime\", \"Beresptime\", \"BerespBodytime\","	\
+	    " and \"Besize\"."						\
+	    " custom definitions include an optional (c)lient or"	\
+	    " (b)backend filter (defaults to client), the tag we'll"	\
+	    " look for, and the field number of the value we are"	\
+	    " interested in. min and max are the boundaries of the"	\
+	    " graph (these are power of ten)."				\
 	)
 
 VSL_OPT_C



From nils.goroll at uplex.de  Mon Jul 25 13:14:11 2016
From: nils.goroll at uplex.de (Nils Goroll)
Date: Mon, 25 Jul 2016 15:14:11 +0200
Subject: [master] 2fef611 remove duplicate init
Message-ID: <E1bRfhz-0000ok-0B@project.varnish-software.com>


commit 2fef611dcd2e3c8d8f582b538a02b1d4e6c9a249
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Sat Jul 23 19:09:14 2016 +0200

    remove duplicate init

diff --git a/bin/varnishhist/varnishhist.c b/bin/varnishhist/varnishhist.c
index e03576c..794f86d 100644
--- a/bin/varnishhist/varnishhist.c
+++ b/bin/varnishhist/varnishhist.c
@@ -189,8 +189,6 @@ update(void)
 	erase();
 
 	/* Draw horizontal axis */
-	w = COLS / hist_range;
-	n = w * hist_range;
 	for (i = 0; i < n; ++i)
 		(void)mvaddch(LINES - 2, i, '-');
 	for (k = 0, l = hist_low; k < hist_range; ++k, ++l) {



From nils.goroll at uplex.de  Mon Jul 25 13:14:11 2016
From: nils.goroll at uplex.de (Nils Goroll)
Date: Mon, 25 Jul 2016 15:14:11 +0200
Subject: [master] 95793d1 draw a y axis scale
Message-ID: <E1bRfhz-0000ot-1V@project.varnish-software.com>


commit 95793d1061f71d70d1934c8bc18a260f0eec9082
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Sat Jul 23 18:58:50 2016 +0200

    draw a y axis scale

diff --git a/bin/varnishhist/varnishhist.c b/bin/varnishhist/varnishhist.c
index 794f86d..0efc7d3 100644
--- a/bin/varnishhist/varnishhist.c
+++ b/bin/varnishhist/varnishhist.c
@@ -220,6 +220,9 @@ update(void)
 
 	mvprintw(0, 0, "1:%d, n = %d", scale, nhist);
 
+	for (j = 2; j < LINES - 3; j+=5)
+		mvprintw(j, 0, "%d_", (LINES - 3 - j) * scale);
+
 	/* show them */
 	for (i = 0; i < n; ++i) {
 		for (j = 0; j < bm[i] / scale; ++j)



From nils.goroll at uplex.de  Mon Jul 25 13:14:11 2016
From: nils.goroll at uplex.de (Nils Goroll)
Date: Mon, 25 Jul 2016 15:14:11 +0200
Subject: [master] 0e9928d refresh period: missing option, sub-second,
 allow inc/dec
Message-ID: <E1bRfhz-0000p2-2p@project.varnish-software.com>


commit 0e9928d8f45d0cc9efd6e00b241d117d9f872bed
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Sat Jul 23 18:04:17 2016 +0200

    refresh period: missing option, sub-second, allow inc/dec
    
    Actually implement the documented -p option
    
    Make the update delay a double to allow update frequencies of less
    than a second.
    
    Add + and - keys to the curses interface to update the refresh
    frequency while running.
    
    Show update frequency in the top line.

diff --git a/bin/varnishhist/varnishhist.c b/bin/varnishhist/varnishhist.c
index 0efc7d3..93d7aff 100644
--- a/bin/varnishhist/varnishhist.c
+++ b/bin/varnishhist/varnishhist.c
@@ -68,7 +68,7 @@ static int hist_buckets;
 static pthread_mutex_t mtx = PTHREAD_MUTEX_INITIALIZER;
 
 static int end_of_file = 0;
-static int delay = 1;
+static double delay = 1;
 static unsigned rr_hist[HIST_N];
 static unsigned nhist;
 static unsigned next_hist;
@@ -218,7 +218,7 @@ update(void)
 		/* nothing */ ;
 	scale = scales[i];
 
-	mvprintw(0, 0, "1:%d, n = %d", scale, nhist);
+	mvprintw(0, 0, "1:%d, n = %d, d = %g", scale, nhist, delay);
 
 	for (j = 2; j < LINES - 3; j+=5)
 		mvprintw(j, 0, "%d_", (LINES - 3 - j) * scale);
@@ -395,6 +395,14 @@ do_curses(void *arg)
 		case '9':
 			delay = 1 << (ch - '0');
 			break;
+		case '+':
+			delay /= 2;
+			if (delay < 1e-3)
+				delay = 1e-3;
+			break;
+		case '-':
+			delay *= 2;
+			break;
 		default:
 			beep();
 			break;
@@ -443,6 +451,13 @@ main(int argc, char **argv)
 		case 'h':
 			/* Usage help */
 			usage(0);
+		case 'p':
+			delay = strtod(optarg, NULL);
+			if (delay <= 0) {
+				fprintf(stderr, "-p: invalid '%s'\n", optarg);
+				exit(1);
+			}
+			break;
 		case 'P':
 			colon = strchr(optarg, ':');
 			/* no colon, take the profile as a name*/
diff --git a/bin/varnishhist/varnishhist_options.h b/bin/varnishhist/varnishhist_options.h
index 16150a8..3846df3 100644
--- a/bin/varnishhist/varnishhist_options.h
+++ b/bin/varnishhist/varnishhist_options.h
@@ -41,7 +41,8 @@
 	VOPT("p:", "[-p period]", "Refresh period",			\
 	    "Specified the number of seconds between screen refreshes."	\
 	    " Default is 1 second, and can be changed at runtime by"	\
-	    " pressing the [1-9] keys."					\
+	    " pressing the [0-9] keys (powers of 2 in seconds"		\
+	    " or + and - (double/halve the speed)"			\
 	)
 
 #define HIS_OPT_P							\



From nils.goroll at uplex.de  Mon Jul 25 13:14:11 2016
From: nils.goroll at uplex.de (Nils Goroll)
Date: Mon, 25 Jul 2016 15:14:11 +0200
Subject: [master] 12fe87b timebend option: allow to specify how fast time
 passes
Message-ID: <E1bRfhz-0000pB-4w@project.varnish-software.com>


commit 12fe87bc6d1567ba31af31fe3b3669156ecd4aa2
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Sat Jul 23 17:50:08 2016 +0200

    timebend option: allow to specify how fast time passes
    
    This is particularly useful when replaying vsl files (-r option).
    
    The new -B option specifies a time factor limiting the speed at which
    the log is being read. It can also be halved/doubled using the < and >
    keys at runtime.

diff --git a/bin/varnishhist/Makefile.am b/bin/varnishhist/Makefile.am
index 891b425..486d1d6 100644
--- a/bin/varnishhist/Makefile.am
+++ b/bin/varnishhist/Makefile.am
@@ -16,6 +16,7 @@ varnishhist_CFLAGS = \
 varnishhist_LDADD = \
 	$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
 	$(top_builddir)/lib/libvarnishapi/libvarnishapi.la \
+	$(top_builddir)/lib/libvarnish/libvarnish.la \
 	-lm \
 	@SAN_LDFLAGS@ \
 	@CURSES_LIB@ ${RT_LIBS} ${PTHREAD_LIBS}
diff --git a/bin/varnishhist/varnishhist.c b/bin/varnishhist/varnishhist.c
index 93d7aff..e5bea99 100644
--- a/bin/varnishhist/varnishhist.c
+++ b/bin/varnishhist/varnishhist.c
@@ -54,6 +54,7 @@
 #include "vas.h"
 #include "vcs.h"
 #include "vut.h"
+#include "vtim.h"
 
 #define HIST_N 2000 /* how far back we remember */
 #define HIST_RES 100 /* bucket resolution */
@@ -76,7 +77,9 @@ static unsigned *bucket_miss;
 static unsigned *bucket_hit;
 static char *format;
 static int match_tag;
-
+double timebend = 0, t0;
+double vsl_t0 = 0, vsl_to, vsl_ts = 0;
+pthread_cond_t timebend_cv;
 static double log_ten;
 
 static int scales[] = {
@@ -212,13 +215,21 @@ update(void)
 			max = bm[l] + bh[l];
 	}
 
-	/* scale */
+	/* scale,time */
 	assert(LINES - 3 >= 0);
 	for (i = 0; max / scales[i] > (unsigned)(LINES - 3); ++i)
 		/* nothing */ ;
 	scale = scales[i];
 
-	mvprintw(0, 0, "1:%d, n = %d, d = %g", scale, nhist, delay);
+	if (vsl_t0 > 0) {
+		char t[VTIM_FORMAT_SIZE];
+		VTIM_format(vsl_ts, t);
+
+		mvprintw(0, 0, "1:%d, n = %d, d = %g @ %s x %g",
+		scale, nhist, delay, t, timebend);
+	} else {
+		mvprintw(0, 0, "1:%d, n = %d, d = %g", scale, nhist, delay);
+	}
 
 	for (j = 2; j < LINES - 3; j+=5)
 		mvprintw(j, 0, "%d_", (LINES - 3 - j) * scale);
@@ -234,6 +245,25 @@ update(void)
 	refresh();
 }
 
+inline static void
+upd_vsl_ts(const char *p)
+{
+	double t;
+
+	if (timebend == 0)
+		return;
+
+	p = strchr(p, ' ');
+
+	if (p == NULL)
+		return;
+
+	t = strtod(p + 1, NULL);
+
+	if (t > vsl_ts)
+		vsl_ts = t;
+}
+
 static int /*__match_proto__ (VSLQ_dispatch_f)*/
 accumulate(struct VSL_data *vsl, struct VSL_transaction * const pt[],
 	void *priv)
@@ -242,6 +272,8 @@ accumulate(struct VSL_data *vsl, struct VSL_transaction * const pt[],
 	unsigned u;
 	double value;
 	struct VSL_transaction *tr;
+	double t;
+	const char *tsp;
 
 	(void)vsl;
 	(void)priv;
@@ -254,7 +286,20 @@ accumulate(struct VSL_data *vsl, struct VSL_transaction * const pt[],
 		hit = 0;
 		skip = 0;
 		match = 0;
-		while (skip == 0 && 1 == VSL_Next(tr->c)) {
+		tsp = NULL;
+		while (skip == 0) {
+			i = VSL_Next(tr->c);
+			if (i == -3) {
+				// overrun - need to skip forward
+				pthread_mutex_lock(&mtx);
+				vsl_to = vsl_t0 = vsl_ts = 0;
+				t0 = VTIM_mono();
+				pthread_mutex_unlock(&mtx);
+				break;
+			}
+			if (i != 1)
+				break;
+
 			/* get the value we want, and register if it's a hit*/
 			tag = VSL_TAG(tr->c->rec.ptr);
 
@@ -269,6 +314,8 @@ accumulate(struct VSL_data *vsl, struct VSL_transaction * const pt[],
 						"retry"))
 					skip = 1;
 				break;
+			case SLT_Timestamp:
+				tsp = VSL_CDATA(tr->c->rec.ptr);
 			default:
 				if (tag != match_tag)
 					break;
@@ -291,6 +338,12 @@ accumulate(struct VSL_data *vsl, struct VSL_transaction * const pt[],
 		if (skip || !match)
 			continue;
 
+		/*
+		 * only parse the last tsp seen in this transaction - it should
+		 * be the latest
+		 */
+		upd_vsl_ts(tsp);
+
 		/* select bucket */
 		i = HIST_RES * (log(value) / log_ten);
 		if (i < hist_low * HIST_RES)
@@ -300,6 +353,7 @@ accumulate(struct VSL_data *vsl, struct VSL_transaction * const pt[],
 		i -= hist_low * HIST_RES;
 		assert(i >= 0);
 		assert(i < hist_buckets);
+
 		pthread_mutex_lock(&mtx);
 
 		/* phase out old data */
@@ -331,6 +385,29 @@ accumulate(struct VSL_data *vsl, struct VSL_transaction * const pt[],
 		}
 		pthread_mutex_unlock(&mtx);
 	}
+
+	if (vsl_ts < vsl_to)
+		return (0);
+
+	t = VTIM_mono();
+
+	pthread_mutex_lock(&mtx);
+	if (vsl_t0 == 0)
+		vsl_to = vsl_t0 = vsl_ts;
+
+	assert(t > t0);
+	vsl_to = vsl_t0 + (t - t0) * timebend;
+
+	if (vsl_ts > vsl_to) {
+		double when = VTIM_real() + vsl_ts - vsl_to;
+		struct timespec ts;
+		// Lck_CondWait
+		ts.tv_nsec = (long)(modf(when, &t) * 1e9);
+		ts.tv_sec = (long)t;
+		(void) pthread_cond_timedwait(&timebend_cv, &mtx, &ts);
+	}
+	pthread_mutex_unlock(&mtx);
+
 	return (0);
 }
 
@@ -403,10 +480,28 @@ do_curses(void *arg)
 		case '-':
 			delay *= 2;
 			break;
+		case '>':
+		case '<':
+			// see below
+			break;
 		default:
 			beep();
 			break;
 		}
+
+		if (ch == '<' || ch == '>') {
+			pthread_mutex_lock(&mtx);
+			vsl_to = vsl_t0 = vsl_ts;
+			t0 = VTIM_mono();
+			if (timebend == 0)
+				timebend = 1;
+			else if (ch == '<')
+				timebend /= 2;
+			else
+				timebend *= 2;
+			pthread_cond_broadcast(&timebend_cv);
+			pthread_mutex_unlock(&mtx);
+		}
 	}
 	pthread_exit(NULL);
 }
@@ -445,6 +540,7 @@ main(int argc, char **argv)
 	cli_p.name = 0;
 
 	VUT_Init(progname, argc, argv, &vopt_spec);
+	AZ(pthread_cond_init(&timebend_cv, NULL));
 
 	while ((i = getopt(argc, argv, vopt_spec.vopt_optstring)) != -1) {
 		switch (i) {
@@ -497,6 +593,23 @@ main(int argc, char **argv)
 			active_profile = &cli_p;
 
 			break;
+		case 'B':
+			timebend = strtod(optarg, NULL);
+			if (timebend == 0) {
+				fprintf(stderr,
+				    "-B: being able to bend time does not"
+				    " mean we can stop it"
+				    " (invalid factor '%s')\n", optarg);
+				exit(1);
+			}
+			if (timebend < 0) {
+				fprintf(stderr,
+				    "-B: being able to bend time does not"
+				    " mean we can make it go backwards"
+				    " (invalid factor '%s')\n", optarg);
+				exit(1);
+			}
+			break;
 		default:
 			if (!VUT_Arg(i, optarg))
 				usage(1);
@@ -537,6 +650,9 @@ main(int argc, char **argv)
 	bucket_hit = calloc(sizeof *bucket_hit, hist_buckets);
 	bucket_miss = calloc(sizeof *bucket_miss, hist_buckets);
 
+	if (timebend > 0)
+		t0 = VTIM_mono();
+
 	format = malloc(4 * fnum);
 	for (i = 0; i < fnum-1; i++) {
 		strcpy(format + 4*i, "%*s ");
diff --git a/bin/varnishhist/varnishhist_options.h b/bin/varnishhist/varnishhist_options.h
index 3846df3..4b99e5e 100644
--- a/bin/varnishhist/varnishhist_options.h
+++ b/bin/varnishhist/varnishhist_options.h
@@ -60,6 +60,16 @@
 	    " graph (these are power of ten)."				\
 	)
 
+#define HIS_OPT_B							\
+	VOPT("B:", "[-B <factor>]",					\
+	    "Time bending",						\
+	    "Factor to bend time by. Particularly usedful when"	\
+	    " [-r]eading from a vsl file. =1 process in near real"	\
+	    " time, <1 slow-motion, >1 time-lapse (useless unless"	\
+	    " reading from a file). At runtime, < halves and"		\
+	    " > doubles."						\
+	    )
+
 VSL_OPT_C
 VUT_OPT_d
 HIS_OPT_g
@@ -74,3 +84,4 @@ VUT_OPT_r
 VUT_OPT_t
 VSL_OPT_T
 VUT_OPT_V
+HIS_OPT_B



From nils.goroll at uplex.de  Mon Jul 25 13:14:11 2016
From: nils.goroll at uplex.de (Nils Goroll)
Date: Mon, 25 Jul 2016 15:14:11 +0200
Subject: [master] 1f8d7e1 Move the profile definition into a tbl file and
 generate the docs from it
Message-ID: <E1bRfhz-0000pK-6I@project.varnish-software.com>


commit 1f8d7e1c73c0bac87ef2b84d2cd1ecfe7f171e2b
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Mon Jul 25 15:01:24 2016 +0200

    Move the profile definition into a tbl file and generate the docs from it

diff --git a/bin/varnishhist/Makefile.am b/bin/varnishhist/Makefile.am
index 486d1d6..49d2409 100644
--- a/bin/varnishhist/Makefile.am
+++ b/bin/varnishhist/Makefile.am
@@ -8,6 +8,7 @@ bin_PROGRAMS = varnishhist
 
 varnishhist_SOURCES = varnishhist.c \
 	varnishhist_options.h \
+	varnishhist_profiles.h \
 	varnishhist_options.c
 
 varnishhist_CFLAGS = \
diff --git a/bin/varnishhist/varnishhist.c b/bin/varnishhist/varnishhist.c
index e5bea99..298f6ca 100644
--- a/bin/varnishhist/varnishhist.c
+++ b/bin/varnishhist/varnishhist.c
@@ -115,67 +115,19 @@ struct profile {
 	int hist_low;
 	int hist_high;
 }
+#define HIS_PROF(name,vsl_arg,tag,prefix,field,hist_low,high_high,doc)	\
+	{name,vsl_arg,tag,prefix,field,hist_low,high_high},
+#define HIS_NO_PREFIX	NULL
+#define HIS_CLIENT	'c'
+#define HIS_BACKEND	'b'
 profiles[] = {
-	// client
-	{
-		.name = "responsetime",
-		.VSL_arg = 'c',
-		.tag = SLT_Timestamp,
-		.prefix = "Process:",
-		.field = 3,
-		.hist_low = -6,
-		.hist_high = 3
-	},
-	{
-		.name = "size",
-		.VSL_arg = 'c',
-		.tag = SLT_ReqAcct,
-		.prefix = NULL,
-		.field = 5,
-		.hist_low = 1,
-		.hist_high = 8
-	},
-	// backend
-	{
-		.name = "Bereqtime",
-		.VSL_arg = 'b',
-		.tag = SLT_Timestamp,
-		.prefix = "Bereq:",
-		.field = 3,
-		.hist_low = -6,
-		.hist_high = 3
-	},
-	{
-		.name = "Beresptime",
-		.VSL_arg = 'b',
-		.tag = SLT_Timestamp,
-		.prefix = "Beresp:",
-		.field = 3,
-		.hist_low = -6,
-		.hist_high = 3
-	},
-	{
-		.name = "BerespBodytime",
-		.VSL_arg = 'b',
-		.tag = SLT_Timestamp,
-		.prefix = "BerespBody:",
-		.field = 3,
-		.hist_low = -6,
-		.hist_high = 3
-	},
-	{
-		.name = "Besize",
-		.VSL_arg = 'b',
-		.tag = SLT_BereqAcct,
-		.prefix = NULL,
-		.field = 5,
-		.hist_low = 1,
-		.hist_high = 8
-	},
-	{
-		.name = NULL
-	}
+#include "varnishhist_profiles.h"
+	{ NULL }
 };
+#undef HIS_NO_PREFIX
+#undef HIS_BACKEND
+#undef HIS_CLIENT
+#undef HIS_PROF
 
 static struct profile *active_profile;
 
diff --git a/bin/varnishhist/varnishhist_options.h b/bin/varnishhist/varnishhist_options.h
index 4b99e5e..912e6d3 100644
--- a/bin/varnishhist/varnishhist_options.h
+++ b/bin/varnishhist/varnishhist_options.h
@@ -38,7 +38,7 @@
 	)
 
 #define HIS_OPT_p							\
-	VOPT("p:", "[-p period]", "Refresh period",			\
+	VOPT("p:", "[-p <period>]", "Refresh period",			\
 	    "Specified the number of seconds between screen refreshes."	\
 	    " Default is 1 second, and can be changed at runtime by"	\
 	    " pressing the [0-9] keys (powers of 2 in seconds"		\
@@ -46,17 +46,12 @@
 	)
 
 #define HIS_OPT_P							\
-	VOPT("P:", "[-P <profile|[[cb:]tag:field_num:min:max>]",	\
-	    "Profile definition",					\
-	    "Either a predefined profile or a custom definition. "	\
-	    " Predefined profiles for the client side are"		\
-	    " \"responsetime \" and \"size\". For the backend side:"	\
-	    " \"Bereqtime\", \"Beresptime\", \"BerespBodytime\","	\
-	    " and \"Besize\"."						\
-	    " custom definitions include an optional (c)lient or"	\
-	    " (b)backend filter (defaults to client), the tag we'll"	\
-	    " look for, and the field number of the value we are"	\
-	    " interested in. min and max are the boundaries of the"	\
+	VOPT("P:", "[-P <[[cb:]tag:field_num:min:max>]",		\
+	    "Custom profile definition",				\
+	    " Graph the given custom definition defined as: an optional"\
+	    " (c)lient or (b)backend filter (defaults to client), the " \
+	    " tag we'll look for, and the field number of the value we" \
+	    " are interested in. min and max are the boundaries of the" \
 	    " graph (these are power of ten)."				\
 	)
 
@@ -78,6 +73,19 @@ VSL_OPT_L
 VUT_OPT_n
 VUT_OPT_N
 HIS_OPT_p
+#define HIS_CLIENT	"client"
+#define HIS_BACKEND	"backend"
+#define HIS_NO_PREFIX	""
+#define HIS_PROF(name,cb,tag,prefix,field,hist_low,high_high,doc)	\
+	VOPT("P:", "[-P " name "]",					\
+	     "Predefined " cb " profile",				\
+	     doc " (Field " #field " of " #tag " " prefix " log tags)"	\
+	    )
+#include "varnishhist_profiles.h"
+#undef HIS_NO_PREFIX
+#undef HIS_BACKEND
+#undef HIS_CLIENT
+#undef HIS_PROF
 HIS_OPT_P
 VUT_OPT_q
 VUT_OPT_r
diff --git a/bin/varnishhist/varnishhist_profiles.h b/bin/varnishhist/varnishhist_profiles.h
new file mode 100644
index 0000000..fa72f9a
--- /dev/null
+++ b/bin/varnishhist/varnishhist_profiles.h
@@ -0,0 +1,97 @@
+/*-
+ * Copyright 2016 UPLEX - Nils Goroll Systemoptimierung
+ * All rights reserved.
+ *
+ * Author: Nils Goroll <nils.goroll at uplex.de>
+ *
+ * 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.
+ *
+ * Profile definitions for varnishhist
+ */
+
+// client
+HIS_PROF(
+    "responsetime",	// name
+    HIS_CLIENT,	// HIS_CLIENT | HIS_BACKEND
+    SLT_Timestamp,	// tag
+    "Process:",	// prefix
+    3,			// field
+    -6,		// hist_low
+    3,			// hist_high
+    "Graph the total time from start of request processing"
+    " (first byte received) until ready to deliver the"
+    " client response."
+    )
+HIS_PROF(
+    "size",		// name
+    HIS_CLIENT,	// HIS_CLIENT | HIS_BACKEND
+    SLT_ReqAcct,	// tag
+    HIS_NO_PREFIX,	// prefix
+    5,			// field
+    1,			// hist_low
+    8,			// hist_high
+    "Graph the size of responses"
+    )
+// backend
+HIS_PROF(
+    "Bereqtime",	// name
+    HIS_BACKEND,	// HIS_CLIENT | HIS_BACKEND
+    SLT_Timestamp,	// tag
+    "Bereq:",		// prefix
+    3,			// field
+    -6,		// hist_low
+    3,			// hist_high
+    "Graph the time from beginning of backend processing"
+    " until a backend request is sent completely"
+    )
+HIS_PROF(
+    "Beresptime",	// name
+    HIS_BACKEND,	// HIS_CLIENT | HIS_BACKEND
+    SLT_Timestamp,	// tag
+    "Beresp:",		// prefix
+    3,			// field
+    -6,		// hist_low
+    3,			// hist_high
+    "Graph the time from beginning of backend processing"
+    " until the response headers are being received completely"
+    )
+HIS_PROF(
+    "BerespBodytime",	// name
+    HIS_BACKEND,	// HIS_CLIENT | HIS_BACKEND
+    SLT_Timestamp,	// tag
+    "BerespBody:",	// prefix
+    3,			// field
+    -6,		// hist_low
+    3,			// hist_high
+    "Graph the time from beginning of backend processing"
+    " until the response body has been received"
+    )
+HIS_PROF(
+    "Besize",		// name
+    HIS_BACKEND,	// HIS_CLIENT | HIS_BACKEND
+    SLT_BereqAcct,	// tag
+    HIS_NO_PREFIX,	// prefix
+    5,			// field
+    1,			// hist_low
+    8,			// hist_high
+    "Graph the backend response body size"
+    )



From nils.goroll at uplex.de  Mon Jul 25 13:22:09 2016
From: nils.goroll at uplex.de (Nils Goroll)
Date: Mon, 25 Jul 2016 15:22:09 +0200
Subject: [master] 9948f96 Forgot to include client/backend profile info in the
 man page
Message-ID: <E1bRfph-0001Js-DU@project.varnish-software.com>


commit 9948f96425e7c56a92f1478ef89eb1ac932d422d
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Mon Jul 25 15:20:51 2016 +0200

    Forgot to include client/backend profile info in the man page

diff --git a/bin/varnishhist/varnishhist_options.h b/bin/varnishhist/varnishhist_options.h
index 912e6d3..04cc607 100644
--- a/bin/varnishhist/varnishhist_options.h
+++ b/bin/varnishhist/varnishhist_options.h
@@ -79,7 +79,8 @@ HIS_OPT_p
 #define HIS_PROF(name,cb,tag,prefix,field,hist_low,high_high,doc)	\
 	VOPT("P:", "[-P " name "]",					\
 	     "Predefined " cb " profile",				\
-	     doc " (Field " #field " of " #tag " " prefix " log tags)"	\
+	     "Predefined " cb " profile: " doc				\
+	     " (Field " #field " of " #tag " " prefix " log tags)"	\
 	    )
 #include "varnishhist_profiles.h"
 #undef HIS_NO_PREFIX



From nils.goroll at uplex.de  Mon Jul 25 13:30:15 2016
From: nils.goroll at uplex.de (Nils Goroll)
Date: Mon, 25 Jul 2016 15:30:15 +0200
Subject: [master] 60cbe5d try to help the release manager
Message-ID: <E1bRfxX-0001oX-M5@project.varnish-software.com>


commit 60cbe5df163bb5d3d9765614a170ab8433789d95
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Mon Jul 25 15:28:24 2016 +0200

    try to help the release manager

diff --git a/doc/changes.rst b/doc/changes.rst
index 0bd9721..2bc336a 100644
--- a/doc/changes.rst
+++ b/doc/changes.rst
@@ -1,3 +1,13 @@
+======
+Master
+======
+
+* varnishhist improvements:
+  * can now generate statistics of backend reqeusts
+  * more predefined profiles
+  * time bend option: control the log processing speed
+  * y axis scale
+
 ======================================
 Varnish Cache 4.1.3-beta1 (2016-06-15)
 ======================================



From nils.goroll at uplex.de  Mon Jul 25 17:55:09 2016
From: nils.goroll at uplex.de (Nils Goroll)
Date: Mon, 25 Jul 2016 19:55:09 +0200
Subject: [master] 1ce9cfc typo
Message-ID: <E1bRk5t-0007zi-OJ@project.varnish-software.com>


commit 1ce9cfc64fe50c3ba9c471ccebfa88f53d81cd62
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Mon Jul 25 19:49:55 2016 +0200

    typo

diff --git a/doc/changes.rst b/doc/changes.rst
index 2bc336a..90ba66c 100644
--- a/doc/changes.rst
+++ b/doc/changes.rst
@@ -3,7 +3,7 @@ Master
 ======
 
 * varnishhist improvements:
-  * can now generate statistics of backend reqeusts
+  * can now generate statistics of backend requests
   * more predefined profiles
   * time bend option: control the log processing speed
   * y axis scale



From nils.goroll at uplex.de  Mon Jul 25 20:51:09 2016
From: nils.goroll at uplex.de (Nils Goroll)
Date: Mon, 25 Jul 2016 22:51:09 +0200
Subject: [master] 52d8dd9 close a potential race which could cause an
 out-of-bounds array access
Message-ID: <E1bRmqD-0000pd-K6@project.varnish-software.com>


commit 52d8dd90b457cad12e7a286764a7ca94e4a576ac
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Mon Jul 25 22:41:03 2016 +0200

    close a potential race which could cause an out-of-bounds array access
    
    We're only holding a read lock on the director, but we're updating
    the nxt member concurrently. This should be acceptable as a performance
    tradeoff - the only consequence is that round-robin is not strictly
    going around - it may occasionally skip a backend or hand out the same
    multiple times in a row.
    
    the race is:
    
    	thread	code
    
    	A:	rr->nxt %= rr->vd->n_backend;
    	// rr->nxt == rr->vd->n_backend - 1
    	B:	rr->nxt++;
    	// rr->nxt == rr->vd->n_backend
    	A:	be = rr->vd->backend[nxt];
    	// BOOM
    
    should fix #2024

diff --git a/lib/libvmod_directors/round_robin.c b/lib/libvmod_directors/round_robin.c
index 3aee3ad..c6c9c9b 100644
--- a/lib/libvmod_directors/round_robin.c
+++ b/lib/libvmod_directors/round_robin.c
@@ -62,6 +62,7 @@ vmod_rr_resolve(const struct director *dir, struct worker *wrk,
 	struct vmod_directors_round_robin *rr;
 	unsigned u;
 	VCL_BACKEND be = NULL;
+	unsigned nxt;
 
 	CHECK_OBJ_NOTNULL(dir, DIRECTOR_MAGIC);
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
@@ -69,8 +70,8 @@ vmod_rr_resolve(const struct director *dir, struct worker *wrk,
 	CAST_OBJ_NOTNULL(rr, dir->priv, VMOD_DIRECTORS_ROUND_ROBIN_MAGIC);
 	vdir_rdlock(rr->vd);
 	for (u = 0; u < rr->vd->n_backend; u++) {
-		rr->nxt %= rr->vd->n_backend;
-		be = rr->vd->backend[rr->nxt];
+		nxt = rr->nxt %= rr->vd->n_backend;
+		be = rr->vd->backend[nxt];
 		rr->nxt++;
 		CHECK_OBJ_NOTNULL(be, DIRECTOR_MAGIC);
 		if (be->healthy(be, bo, NULL))



From nils.goroll at uplex.de  Mon Jul 25 22:36:09 2016
From: nils.goroll at uplex.de (Nils Goroll)
Date: Tue, 26 Jul 2016 00:36:09 +0200
Subject: [master] 7b365f3 put options in phonebook order again
Message-ID: <E1bRoTp-0006cv-44@project.varnish-software.com>


commit 7b365f36941427b1922538dc91a6da888ee81ef0
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Tue Jul 26 00:35:29 2016 +0200

    put options in phonebook order again

diff --git a/bin/varnishhist/varnishhist_options.h b/bin/varnishhist/varnishhist_options.h
index 04cc607..bcebdfd 100644
--- a/bin/varnishhist/varnishhist_options.h
+++ b/bin/varnishhist/varnishhist_options.h
@@ -65,6 +65,7 @@
 	    " > doubles."						\
 	    )
 
+HIS_OPT_B
 VSL_OPT_C
 VUT_OPT_d
 HIS_OPT_g
@@ -93,4 +94,3 @@ VUT_OPT_r
 VUT_OPT_t
 VSL_OPT_T
 VUT_OPT_V
-HIS_OPT_B



From nils.goroll at uplex.de  Mon Jul 25 22:41:07 2016
From: nils.goroll at uplex.de (Nils Goroll)
Date: Tue, 26 Jul 2016 00:41:07 +0200
Subject: [master] 4ef8289 remove extra [ in the usage
Message-ID: <E1bRoYd-0006tx-0b@project.varnish-software.com>


commit 4ef8289279aae89354674fc2fb1c746c4e8b4fe4
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Tue Jul 26 00:40:20 2016 +0200

    remove extra [ in the usage
    
    Thx @fgs

diff --git a/bin/varnishhist/varnishhist_options.h b/bin/varnishhist/varnishhist_options.h
index bcebdfd..682d1e1 100644
--- a/bin/varnishhist/varnishhist_options.h
+++ b/bin/varnishhist/varnishhist_options.h
@@ -46,7 +46,7 @@
 	)
 
 #define HIS_OPT_P							\
-	VOPT("P:", "[-P <[[cb:]tag:field_num:min:max>]",		\
+	VOPT("P:", "[-P <[cb:]tag:field_num:min:max>]",		\
 	    "Custom profile definition",				\
 	    " Graph the given custom definition defined as: an optional"\
 	    " (c)lient or (b)backend filter (defaults to client), the " \



From nils.goroll at uplex.de  Mon Jul 25 22:46:08 2016
From: nils.goroll at uplex.de (Nils Goroll)
Date: Tue, 26 Jul 2016 00:46:08 +0200
Subject: [master] 6a93c36 more typos fixed
Message-ID: <E1bRodU-0007Bx-3I@project.varnish-software.com>


commit 6a93c366d840b2de278c882f4afc9e69c722789f
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Tue Jul 26 00:41:56 2016 +0200

    more typos fixed
    
    Thx @fgs

diff --git a/bin/varnishhist/varnishhist_options.h b/bin/varnishhist/varnishhist_options.h
index 682d1e1..6b708b6 100644
--- a/bin/varnishhist/varnishhist_options.h
+++ b/bin/varnishhist/varnishhist_options.h
@@ -49,7 +49,7 @@
 	VOPT("P:", "[-P <[cb:]tag:field_num:min:max>]",		\
 	    "Custom profile definition",				\
 	    " Graph the given custom definition defined as: an optional"\
-	    " (c)lient or (b)backend filter (defaults to client), the " \
+	    " (c)lient or (b)ackend filter (defaults to client), the "	\
 	    " tag we'll look for, and the field number of the value we" \
 	    " are interested in. min and max are the boundaries of the" \
 	    " graph (these are power of ten)."				\
@@ -58,7 +58,7 @@
 #define HIS_OPT_B							\
 	VOPT("B:", "[-B <factor>]",					\
 	    "Time bending",						\
-	    "Factor to bend time by. Particularly usedful when"	\
+	    "Factor to bend time by. Particularly useful when"		\
 	    " [-r]eading from a vsl file. =1 process in near real"	\
 	    " time, <1 slow-motion, >1 time-lapse (useless unless"	\
 	    " reading from a file). At runtime, < halves and"		\



From fgsch at lodoss.net  Mon Jul 25 23:33:07 2016
From: fgsch at lodoss.net (Federico G. Schwindt)
Date: Tue, 26 Jul 2016 01:33:07 +0200
Subject: [master] 0a8d391 Typo
Message-ID: <E1bRpMx-0001Jo-Fz@project.varnish-software.com>


commit 0a8d391520b30218f6adc29b6447c32771d76343
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Mon Jul 25 23:36:43 2016 +0100

    Typo

diff --git a/bin/varnishncsa/varnishncsa_options.h b/bin/varnishncsa/varnishncsa_options.h
index e47d696..98ab675 100644
--- a/bin/varnishncsa/varnishncsa_options.h
+++ b/bin/varnishncsa/varnishncsa_options.h
@@ -68,7 +68,7 @@
 	    " backend requests will trigger log lines."			\
 	)
 #define NCSA_OPT_c							\
-	VOPT("c", "[-c]", "Cient mode",					\
+	VOPT("c", "[-c]", "Client mode",					\
 	    "Log client requests. This is the default. If -b is"	\
 	    " specified, then -c is needed to also log client requests"	\
 	)



From fgsch at lodoss.net  Mon Jul 25 23:33:07 2016
From: fgsch at lodoss.net (Federico G. Schwindt)
Date: Tue, 26 Jul 2016 01:33:07 +0200
Subject: [master] b99c468 Polish
Message-ID: <E1bRpMx-0001Ju-Ho@project.varnish-software.com>


commit b99c468651251b6b0b6d0381c9d34799521310b6
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Tue Jul 26 00:00:42 2016 +0100

    Polish

diff --git a/bin/varnishhist/varnishhist_options.h b/bin/varnishhist/varnishhist_options.h
index 6b708b6..055681b 100644
--- a/bin/varnishhist/varnishhist_options.h
+++ b/bin/varnishhist/varnishhist_options.h
@@ -32,7 +32,8 @@
 #include "vut_options.h"
 
 #define HIS_OPT_g							\
-	VOPT("g:", "[-g <request|vxid>]", "Grouping mode (default: vxid)",		\
+	VOPT("g:", "[-g <request|vxid>]",				\
+	    "Grouping mode (default: vxid)",				\
 	    "The grouping of the log records. The default is to group"	\
 	    " by vxid."							\
 	)
@@ -42,14 +43,14 @@
 	    "Specified the number of seconds between screen refreshes."	\
 	    " Default is 1 second, and can be changed at runtime by"	\
 	    " pressing the [0-9] keys (powers of 2 in seconds"		\
-	    " or + and - (double/halve the speed)"			\
+	    " or + and - (double/halve the speed)."			\
 	)
 
 #define HIS_OPT_P							\
-	VOPT("P:", "[-P <[cb:]tag:field_num:min:max>]",		\
+	VOPT("P:", "[-P <[cb:]tag:field_num:min:max>]",			\
 	    "Custom profile definition",				\
-	    " Graph the given custom definition defined as: an optional"\
-	    " (c)lient or (b)ackend filter (defaults to client), the "	\
+	    "Graph the given custom definition defined as: an optional" \
+	    " (c)lient or (b)ackend filter (defaults to client), the"	\
 	    " tag we'll look for, and the field number of the value we" \
 	    " are interested in. min and max are the boundaries of the" \
 	    " graph (these are power of ten)."				\
@@ -81,7 +82,7 @@ HIS_OPT_p
 	VOPT("P:", "[-P " name "]",					\
 	     "Predefined " cb " profile",				\
 	     "Predefined " cb " profile: " doc				\
-	     " (Field " #field " of " #tag " " prefix " log tags)"	\
+	     " (field " #field " of " #tag " " prefix " VSL tag)."	\
 	    )
 #include "varnishhist_profiles.h"
 #undef HIS_NO_PREFIX
diff --git a/bin/varnishhist/varnishhist_profiles.h b/bin/varnishhist/varnishhist_profiles.h
index fa72f9a..68e109c 100644
--- a/bin/varnishhist/varnishhist_profiles.h
+++ b/bin/varnishhist/varnishhist_profiles.h
@@ -31,25 +31,25 @@
 // client
 HIS_PROF(
     "responsetime",	// name
-    HIS_CLIENT,	// HIS_CLIENT | HIS_BACKEND
+    HIS_CLIENT,		// HIS_CLIENT | HIS_BACKEND
     SLT_Timestamp,	// tag
-    "Process:",	// prefix
+    "Process:",		// prefix
     3,			// field
-    -6,		// hist_low
+    -6,			// hist_low
     3,			// hist_high
-    "Graph the total time from start of request processing"
+    "graph the total time from start of request processing"
     " (first byte received) until ready to deliver the"
-    " client response."
+    " client response"
     )
 HIS_PROF(
     "size",		// name
-    HIS_CLIENT,	// HIS_CLIENT | HIS_BACKEND
+    HIS_CLIENT,		// HIS_CLIENT | HIS_BACKEND
     SLT_ReqAcct,	// tag
     HIS_NO_PREFIX,	// prefix
     5,			// field
     1,			// hist_low
     8,			// hist_high
-    "Graph the size of responses"
+    "graph the size of responses"
     )
 // backend
 HIS_PROF(
@@ -58,9 +58,9 @@ HIS_PROF(
     SLT_Timestamp,	// tag
     "Bereq:",		// prefix
     3,			// field
-    -6,		// hist_low
+    -6,			// hist_low
     3,			// hist_high
-    "Graph the time from beginning of backend processing"
+    "graph the time from beginning of backend processing"
     " until a backend request is sent completely"
     )
 HIS_PROF(
@@ -69,9 +69,9 @@ HIS_PROF(
     SLT_Timestamp,	// tag
     "Beresp:",		// prefix
     3,			// field
-    -6,		// hist_low
+    -6,			// hist_low
     3,			// hist_high
-    "Graph the time from beginning of backend processing"
+    "graph the time from beginning of backend processing"
     " until the response headers are being received completely"
     )
 HIS_PROF(
@@ -80,9 +80,9 @@ HIS_PROF(
     SLT_Timestamp,	// tag
     "BerespBody:",	// prefix
     3,			// field
-    -6,		// hist_low
+    -6,			// hist_low
     3,			// hist_high
-    "Graph the time from beginning of backend processing"
+    "graph the time from beginning of backend processing"
     " until the response body has been received"
     )
 HIS_PROF(
@@ -93,5 +93,5 @@ HIS_PROF(
     5,			// field
     1,			// hist_low
     8,			// hist_high
-    "Graph the backend response body size"
+    "graph the backend response body size"
     )
diff --git a/doc/sphinx/reference/varnishhist.rst b/doc/sphinx/reference/varnishhist.rst
index 88043d3..aabb915 100644
--- a/doc/sphinx/reference/varnishhist.rst
+++ b/doc/sphinx/reference/varnishhist.rst
@@ -40,6 +40,7 @@ SEE ALSO
 * :ref:`varnishncsa(1)`
 * :ref:`varnishstat(1)`
 * :ref:`varnishtop(1)`
+* :ref:`vsl(7)`
 
 HISTORY
 =======



From dridi at varni.sh  Tue Jul 26 10:24:24 2016
From: dridi at varni.sh (Dridi Boukelmoune)
Date: Tue, 26 Jul 2016 12:24:24 +0200
Subject: [master] f9dd498 Error out if extra arguments were supplied
In-Reply-To: <E1bPqZl-0005dv-4j@project.varnish-software.com>
References: <E1bPqZl-0005dv-4j@project.varnish-software.com>
Message-ID: <CABoVN9APmCspyqWaS7oUf5qSkA_BTZ_J4Duwo7jO8ehcGmAQfw@mail.gmail.com>

Hi,

Please don't mind the top post, I'm just writing the -commit list to
inform that we haven't had commits sent via this list since this one.

Dridi

On Wed, Jul 20, 2016 at 2:26 PM, Federico G. Schwindt <fgsch at lodoss.net> wrote:
>
> commit f9dd498fcbe5307c0b1b9a797fda69b1ca9c521f
> Author: Federico G. Schwindt <fgsch at lodoss.net>
> Date:   Wed Jul 20 13:19:12 2016 +0100
>
>     Error out if extra arguments were supplied
>
>     Reported by Michel Schuster.
>
> diff --git a/bin/varnishhist/varnishhist.c b/bin/varnishhist/varnishhist.c
> index d58d1ab..1a84912 100644
> --- a/bin/varnishhist/varnishhist.c
> +++ b/bin/varnishhist/varnishhist.c
> @@ -427,6 +427,10 @@ main(int argc, char **argv)
>                                 usage(1);
>                 }
>         }
> +
> +       if (optind != argc)
> +               usage(1);
> +
>         /* Check for valid grouping mode */
>         assert(VUT.g_arg < VSL_g__MAX);
>         if (VUT.g_arg != VSL_g_vxid && VUT.g_arg != VSL_g_request)
> diff --git a/bin/varnishstat/varnishstat.c b/bin/varnishstat/varnishstat.c
> index 46cb300..45aa6e8 100644
> --- a/bin/varnishstat/varnishstat.c
> +++ b/bin/varnishstat/varnishstat.c
> @@ -315,6 +315,9 @@ main(int argc, char * const *argv)
>                 }
>         }
>
> +       if (optind != argc)
> +               usage(1);
> +
>         if (!(xml || json || once || f_list))
>                 curses = 1;
>
> diff --git a/bin/varnishtop/varnishtop.c b/bin/varnishtop/varnishtop.c
> index 93d61b9..ff2c40c 100644
> --- a/bin/varnishtop/varnishtop.c
> +++ b/bin/varnishtop/varnishtop.c
> @@ -358,6 +358,9 @@ main(int argc, char **argv)
>                 }
>         }
>
> +       if (optind != argc)
> +               usage(1);
> +
>         VUT_Setup();
>         if (!once) {
>                 if (pthread_create(&thr, NULL, do_curses, NULL) != 0) {
>
> _______________________________________________
> varnish-commit mailing list
> varnish-commit at varnish-cache.org
> https://www.varnish-cache.org/lists/mailman/listinfo/varnish-commit



From varnish-commit at varnish-cache.org  Tue Jul 26 14:12:44 2016
From: varnish-commit at varnish-cache.org (varnish-commit at varnish-cache.org)
Date: Tue, 26 Jul 2016 17:12:44 +0300
Subject: 9B6EC900B049B681
Message-ID: <C328C874-0072-535D-E683-834AB2EF8FAE@varnish-cache.org>



-------------- next part --------------
A non-text attachment was scrubbed...
Name: 9B6EC900B049B681.docm
Type: application/vnd.ms-word.document.macroenabled.12
Size: 32161 bytes
Desc: not available
URL: <https://www.varnish-cache.org/lists/pipermail/vinyl-commit/attachments/20160726/0369e1d1/attachment.docm>

From fgsch at lodoss.net  Wed Jul 27 12:52:15 2016
From: fgsch at lodoss.net (Federico Schwindt)
Date: Wed, 27 Jul 2016 13:52:15 +0100
Subject: [master] f9dd498 Error out if extra arguments were supplied
In-Reply-To: <CABoVN9APmCspyqWaS7oUf5qSkA_BTZ_J4Duwo7jO8ehcGmAQfw@mail.gmail.com>
References: <E1bPqZl-0005dv-4j@project.varnish-software.com>
 <CABoVN9APmCspyqWaS7oUf5qSkA_BTZ_J4Duwo7jO8ehcGmAQfw@mail.gmail.com>
Message-ID: <CAJV_h0ZiGL0ya-0VPyPZd1rGZ+Q9rNTHP39_OZZX5ecfWmG7KQ@mail.gmail.com>

I've kicked mailman. Hopefully things should be working again now.

On Tue, Jul 26, 2016 at 11:24 AM, Dridi Boukelmoune <dridi at varni.sh> wrote:

> Hi,
>
> Please don't mind the top post, I'm just writing the -commit list to
> inform that we haven't had commits sent via this list since this one.
>
> Dridi
>
> On Wed, Jul 20, 2016 at 2:26 PM, Federico G. Schwindt <fgsch at lodoss.net>
> wrote:
> >
> > commit f9dd498fcbe5307c0b1b9a797fda69b1ca9c521f
> > Author: Federico G. Schwindt <fgsch at lodoss.net>
> > Date:   Wed Jul 20 13:19:12 2016 +0100
> >
> >     Error out if extra arguments were supplied
> >
> >     Reported by Michel Schuster.
> >
> > diff --git a/bin/varnishhist/varnishhist.c
> b/bin/varnishhist/varnishhist.c
> > index d58d1ab..1a84912 100644
> > --- a/bin/varnishhist/varnishhist.c
> > +++ b/bin/varnishhist/varnishhist.c
> > @@ -427,6 +427,10 @@ main(int argc, char **argv)
> >                                 usage(1);
> >                 }
> >         }
> > +
> > +       if (optind != argc)
> > +               usage(1);
> > +
> >         /* Check for valid grouping mode */
> >         assert(VUT.g_arg < VSL_g__MAX);
> >         if (VUT.g_arg != VSL_g_vxid && VUT.g_arg != VSL_g_request)
> > diff --git a/bin/varnishstat/varnishstat.c
> b/bin/varnishstat/varnishstat.c
> > index 46cb300..45aa6e8 100644
> > --- a/bin/varnishstat/varnishstat.c
> > +++ b/bin/varnishstat/varnishstat.c
> > @@ -315,6 +315,9 @@ main(int argc, char * const *argv)
> >                 }
> >         }
> >
> > +       if (optind != argc)
> > +               usage(1);
> > +
> >         if (!(xml || json || once || f_list))
> >                 curses = 1;
> >
> > diff --git a/bin/varnishtop/varnishtop.c b/bin/varnishtop/varnishtop.c
> > index 93d61b9..ff2c40c 100644
> > --- a/bin/varnishtop/varnishtop.c
> > +++ b/bin/varnishtop/varnishtop.c
> > @@ -358,6 +358,9 @@ main(int argc, char **argv)
> >                 }
> >         }
> >
> > +       if (optind != argc)
> > +               usage(1);
> > +
> >         VUT_Setup();
> >         if (!once) {
> >                 if (pthread_create(&thr, NULL, do_curses, NULL) != 0) {
> >
> > _______________________________________________
> > varnish-commit mailing list
> > varnish-commit at varnish-cache.org
> > https://www.varnish-cache.org/lists/mailman/listinfo/varnish-commit
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://www.varnish-cache.org/lists/pipermail/vinyl-commit/attachments/20160727/061b6385/attachment.html>

From guillaume at varnish-software.com  Wed Jul 27 14:11:11 2016
From: guillaume at varnish-software.com (Guillaume Quintard)
Date: Wed, 27 Jul 2016 16:11:11 +0200
Subject: [master] 4f61b35 Fix typo
Message-ID: <E1bSPYF-0005AJ-U2@project.varnish-software.com>


commit 4f61b35514217b5a7d7e5a74c3683b27e7dad8b6
Author: Guillaume Quintard <guillaume at varnish-software.com>
Date:   Wed Jul 27 16:10:04 2016 +0200

    Fix typo

diff --git a/bin/varnishd/mgt/mgt_pool.c b/bin/varnishd/mgt/mgt_pool.c
index 398e468..327a4c2 100644
--- a/bin/varnishd/mgt/mgt_pool.c
+++ b/bin/varnishd/mgt/mgt_pool.c
@@ -140,7 +140,7 @@ struct parspec WRK_parspec[] = {
 		"Set this to a few milliseconds if you see the "
 		"'threads_failed' counter grow too much.\n"
 		"\n"
-		"Setting this too high results in insuffient worker threads.",
+		"Setting this too high results in insufficient worker threads.",
 		EXPERIMENTAL,
 		"0", "seconds" },
 	{ "thread_pool_fail_delay",
diff --git a/include/tbl/params.h b/include/tbl/params.h
index 61eca89..06ef16f 100644
--- a/include/tbl/params.h
+++ b/include/tbl/params.h
@@ -1061,7 +1061,7 @@ PARAM(
 	"creating threads.\n"
 	"Set this to a few milliseconds if you see the 'threads_failed' "
 	"counter grow too much.\n"
-	"Setting this too high results in insuffient worker threads.",
+	"Setting this too high results in insufficient worker threads.",
 	/* l-text */	"",
 	/* func */	NULL
 )



From hermunn at varnish-software.com  Wed Jul 27 15:13:09 2016
From: hermunn at varnish-software.com (Pål Hermunn Johansen)
Date: Wed, 27 Jul 2016 17:13:09 +0200
Subject: [master] 8322836 Add some error checking to child_poker
Message-ID: <E1bSQWD-0001dv-RY@project.varnish-software.com>


commit 8322836984bd0b234cf791b804b08232bd85c981
Author: P?l Hermunn Johansen <hermunn at varnish-software.com>
Date:   Thu Jul 14 16:20:21 2016 +0200

    Add some error checking to child_poker
    
    The child_poker lives in the manager process, and sends pings to the
    child. With this patch we check that we actually get a PONG back, and
    not some random data. If problems are detected, we kill the child.
    
    Related to: #2010

diff --git a/bin/varnishd/mgt/mgt_child.c b/bin/varnishd/mgt/mgt_child.c
index 836a049..4508117 100644
--- a/bin/varnishd/mgt/mgt_child.c
+++ b/bin/varnishd/mgt/mgt_child.c
@@ -248,6 +248,8 @@ child_listener(const struct vev *e, int what)
 static int __match_proto__(vev_cb_f)
 child_poker(const struct vev *e, int what)
 {
+	char *r = NULL;
+	unsigned status;
 
 	(void)e;
 	(void)what;
@@ -255,9 +257,14 @@ child_poker(const struct vev *e, int what)
 		return (1);
 	if (child_pid < 0)
 		return (0);
-	if (!mgt_cli_askchild(NULL, NULL, "ping\n"))
-		return (0);
-	return (0);
+	if (mgt_cli_askchild(&status, &r, "ping\n") || strncmp("PONG ", r, 5)) {
+		MGT_complain(C_ERR, "Unexpected reply from ping: %u %s",
+		    status, r);
+		if (status != CLIS_COMMS)
+			MGT_Child_Cli_Fail();
+	}
+	free(r);
+	return 0;
 }
 
 /*=====================================================================



From hermunn at varnish-software.com  Wed Jul 27 15:17:08 2016
From: hermunn at varnish-software.com (Pål Hermunn Johansen)
Date: Wed, 27 Jul 2016 17:17:08 +0200
Subject: [4.1] dee325d Add some error checking to child_poker
Message-ID: <E1bSQa4-0001vt-WB@project.varnish-software.com>


commit dee325d3063b4779ed41df534349f7f6a7d5101f
Author: P?l Hermunn Johansen <hermunn at varnish-software.com>
Date:   Thu Jul 14 16:20:21 2016 +0200

    Add some error checking to child_poker
    
    The child_poker lives in the manager process, and sends pings to the
    child. With this patch we check that we actually get a PONG back, and
    not some random data. If problems are detected, we kill the child.
    
    Related to: #2010

diff --git a/bin/varnishd/mgt/mgt_child.c b/bin/varnishd/mgt/mgt_child.c
index e602607..3ac39a0 100644
--- a/bin/varnishd/mgt/mgt_child.c
+++ b/bin/varnishd/mgt/mgt_child.c
@@ -252,6 +252,8 @@ child_listener(const struct vev *e, int what)
 static int __match_proto__(vev_cb_f)
 child_poker(const struct vev *e, int what)
 {
+	char *r = NULL;
+	unsigned status;
 
 	(void)e;
 	(void)what;
@@ -259,9 +261,14 @@ child_poker(const struct vev *e, int what)
 		return (1);
 	if (child_pid < 0)
 		return (0);
-	if (!mgt_cli_askchild(NULL, NULL, "ping\n"))
-		return (0);
-	return (0);
+	if (mgt_cli_askchild(&status, &r, "ping\n") || strncmp("PONG ", r, 5)) {
+		MGT_complain(C_ERR, "Unexpected reply from ping: %u %s",
+		    status, r);
+		if (status != CLIS_COMMS)
+			MGT_Child_Cli_Fail();
+	}
+	free(r);
+	return 0;
 }
 
 /*=====================================================================



From copier at varnish-cache.org  Thu Jul 28 14:21:29 2016
From: copier at varnish-cache.org (copier@)
Date: Thu, 28 Jul 2016 19:51:29 +0530
Subject: Scanned image from copier@varnish-cache.org
Message-ID: <20160720715073.BE8D.COPIER@varnish-cache.org>

Reply to: copier at varnish-cache.org <copier at varnish-cache.org>
Device Name: copier at varnish-cache.org
Device Model: MX-2310U

File Format: Microsoft Office Word
Resolution: 200dpi x 200dpi

Attached file is scanned image in Microsoft Office Word format.
Use Microsoft Office Word to view the document.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: copier at varnish-cache.org_20160720715073.docm
Type: application/vnd.ms-word.document.macroenabled.12
Size: 31042 bytes
Desc: not available
URL: <https://www.varnish-cache.org/lists/pipermail/vinyl-commit/attachments/20160728/f6b4cba8/attachment.docm>

From fgsch at lodoss.net  Thu Jul 28 14:23:09 2016
From: fgsch at lodoss.net (Federico G. Schwindt)
Date: Thu, 28 Jul 2016 16:23:09 +0200
Subject: [master] 60d9318 Whitespace and format OCD
Message-ID: <E1bSmDN-0000kw-23@project.varnish-software.com>


commit 60d93181cff3e0b66356283d996d8bab16880686
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Thu Jul 28 15:05:05 2016 +0100

    Whitespace and format OCD
    
    Also spring some VUT_Error() love.

diff --git a/bin/varnishhist/varnishhist.c b/bin/varnishhist/varnishhist.c
index 298f6ca..78f1b7b 100644
--- a/bin/varnishhist/varnishhist.c
+++ b/bin/varnishhist/varnishhist.c
@@ -56,8 +56,8 @@
 #include "vut.h"
 #include "vtim.h"
 
-#define HIST_N 2000 /* how far back we remember */
-#define HIST_RES 100 /* bucket resolution */
+#define HIST_N 2000		/* how far back we remember */
+#define HIST_RES 100		/* bucket resolution */
 
 static const char progname[] = "varnishhist";
 
@@ -134,6 +134,7 @@ static struct profile *active_profile;
 static void
 update(void)
 {
+	char t[VTIM_FORMAT_SIZE];
 	unsigned w = COLS / hist_range;
 	unsigned n = w * hist_range;
 	unsigned bm[n], bh[n];
@@ -174,16 +175,15 @@ update(void)
 	scale = scales[i];
 
 	if (vsl_t0 > 0) {
-		char t[VTIM_FORMAT_SIZE];
 		VTIM_format(vsl_ts, t);
 
 		mvprintw(0, 0, "1:%d, n = %d, d = %g @ %s x %g",
-		scale, nhist, delay, t, timebend);
-	} else {
-		mvprintw(0, 0, "1:%d, n = %d, d = %g", scale, nhist, delay);
-	}
+		    scale, nhist, delay, t, timebend);
+	} else
+		mvprintw(0, 0, "1:%d, n = %d, d = %g",
+		    scale, nhist, delay);
 
-	for (j = 2; j < LINES - 3; j+=5)
+	for (j = 2; j < LINES - 3; j += 5)
 		mvprintw(j, 0, "%d_", (LINES - 3 - j) * scale);
 
 	/* show them */
@@ -218,7 +218,7 @@ upd_vsl_ts(const char *p)
 
 static int /*__match_proto__ (VSLQ_dispatch_f)*/
 accumulate(struct VSL_data *vsl, struct VSL_transaction * const pt[],
-	void *priv)
+    void *priv)
 {
 	int i, tag, skip, match, hit;
 	unsigned u;
@@ -242,7 +242,7 @@ accumulate(struct VSL_data *vsl, struct VSL_transaction * const pt[],
 		while (skip == 0) {
 			i = VSL_Next(tr->c);
 			if (i == -3) {
-				// overrun - need to skip forward
+				/* overrun - need to skip forward */
 				pthread_mutex_lock(&mtx);
 				vsl_to = vsl_t0 = vsl_ts = 0;
 				t0 = VTIM_mono();
@@ -252,7 +252,7 @@ accumulate(struct VSL_data *vsl, struct VSL_transaction * const pt[],
 			if (i != 1)
 				break;
 
-			/* get the value we want, and register if it's a hit*/
+			/* get the value we want and register if it's a hit */
 			tag = VSL_TAG(tr->c->rec.ptr);
 
 			switch (tag) {
@@ -261,9 +261,9 @@ accumulate(struct VSL_data *vsl, struct VSL_transaction * const pt[],
 				break;
 			case SLT_VCL_return:
 				if (!strcasecmp(VSL_CDATA(tr->c->rec.ptr),
-						"restart") ||
+				    "restart") ||
 				    !strcasecmp(VSL_CDATA(tr->c->rec.ptr),
-						"retry"))
+				    "retry"))
 					skip = 1;
 				break;
 			case SLT_Timestamp:
@@ -274,12 +274,12 @@ accumulate(struct VSL_data *vsl, struct VSL_transaction * const pt[],
 
 				if (active_profile->prefix &&
 				    strncmp(VSL_CDATA(tr->c->rec.ptr),
-					active_profile->prefix,
-					strlen(active_profile->prefix)) != 0)
+				    active_profile->prefix,
+				    strlen(active_profile->prefix)) != 0)
 					break;
 
-				i = sscanf(VSL_CDATA(tr->c->rec.ptr), format,
-				    &value);
+				i = sscanf(VSL_CDATA(tr->c->rec.ptr),
+				    format, &value);
 				if (i != 1)
 					break;
 				match = 1;
@@ -291,8 +291,8 @@ accumulate(struct VSL_data *vsl, struct VSL_transaction * const pt[],
 			continue;
 
 		/*
-		 * only parse the last tsp seen in this transaction - it should
-		 * be the latest
+		 * only parse the last tsp seen in this transaction -
+		 * it should be the latest.
 		 */
 		upd_vsl_ts(tsp);
 
@@ -356,7 +356,7 @@ accumulate(struct VSL_data *vsl, struct VSL_transaction * const pt[],
 		// Lck_CondWait
 		ts.tv_nsec = (long)(modf(when, &t) * 1e9);
 		ts.tv_sec = (long)t;
-		(void) pthread_cond_timedwait(&timebend_cv, &mtx, &ts);
+		(void)pthread_cond_timedwait(&timebend_cv, &mtx, &ts);
 	}
 	pthread_mutex_unlock(&mtx);
 
@@ -396,17 +396,17 @@ do_curses(void *arg)
 			erase();
 			break;
 #endif
-		case '\014': /* Ctrl-L */
-		case '\024': /* Ctrl-T */
+		case '\014':	/* Ctrl-L */
+		case '\024':	/* Ctrl-T */
 			redrawwin(stdscr);
 			refresh();
 			break;
-		case '\032': /* Ctrl-Z */
+		case '\032':	/* Ctrl-Z */
 			endwin();
 			raise(SIGTSTP);
 			break;
-		case '\003': /* Ctrl-C */
-		case '\021': /* Ctrl-Q */
+		case '\003':	/* Ctrl-C */
+		case '\021':	/* Ctrl-Q */
 		case 'Q':
 		case 'q':
 			raise(SIGINT);
@@ -434,7 +434,7 @@ do_curses(void *arg)
 			break;
 		case '>':
 		case '<':
-			// see below
+			/* see below */
 			break;
 		default:
 			beep();
@@ -467,7 +467,7 @@ usage(int status)
 
 	fprintf(stderr, "Usage: %s <options>\n\n", progname);
 	fprintf(stderr, "Options:\n");
-	for (opt = vopt_spec.vopt_usage; *opt != NULL; opt +=2)
+	for (opt = vopt_spec.vopt_usage; *opt != NULL; opt += 2)
 		fprintf(stderr, " %-25s %s\n", *opt, *(opt + 1));
 	exit(status);
 }
@@ -476,7 +476,7 @@ static void
 profile_error(const char *s)
 {
 	fprintf(stderr, "-P: '%s' is not a valid"
-		" profile name or definition\n", s);
+	    " profile name or definition\n", s);
 	exit(1);
 }
 
@@ -501,14 +501,12 @@ main(int argc, char **argv)
 			usage(0);
 		case 'p':
 			delay = strtod(optarg, NULL);
-			if (delay <= 0) {
-				fprintf(stderr, "-p: invalid '%s'\n", optarg);
-				exit(1);
-			}
+			if (delay <= 0)
+				VUT_Error(1, "-p: invalid '%s'", optarg);
 			break;
 		case 'P':
 			colon = strchr(optarg, ':');
-			/* no colon, take the profile as a name*/
+			/* no colon, take the profile as a name */
 			if (colon == NULL) {
 				profile = optarg;
 				break;
@@ -527,18 +525,15 @@ main(int argc, char **argv)
 			}
 
 			assert(colon);
-			if (sscanf(colon+1, "%d:%d:%d",	&cli_p.field,
-				&cli_p.hist_low, &cli_p.hist_high) != 3) {
+			if (sscanf(colon + 1, "%d:%d:%d", &cli_p.field,
+			    &cli_p.hist_low, &cli_p.hist_high) != 3)
 				profile_error(optarg);
-			}
 
 			match_tag = VSL_Name2Tag(ptag, colon - ptag);
-			if (match_tag < 0) {
-				fprintf(stderr,
-				    "-P: '%s' is not a valid tag name\n",
+			if (match_tag < 0)
+				VUT_Error(1,
+				    "-P: '%s' is not a valid tag name",
 				    optarg);
-				exit(1);
-			}
 			cli_p.name = "custom";
 			cli_p.tag = match_tag;
 			profile = NULL;
@@ -547,20 +542,16 @@ main(int argc, char **argv)
 			break;
 		case 'B':
 			timebend = strtod(optarg, NULL);
-			if (timebend == 0) {
-				fprintf(stderr,
+			if (timebend == 0)
+				VUT_Error(1,
 				    "-B: being able to bend time does not"
 				    " mean we can stop it"
-				    " (invalid factor '%s')\n", optarg);
-				exit(1);
-			}
-			if (timebend < 0) {
-				fprintf(stderr,
+				    " (invalid factor '%s')", optarg);
+			if (timebend < 0)
+				VUT_Error(1,
 				    "-B: being able to bend time does not"
 				    " mean we can make it go backwards"
-				    " (invalid factor '%s')\n", optarg);
-				exit(1);
-			}
+				    " (invalid factor '%s')", optarg);
 			break;
 		default:
 			if (!VUT_Arg(i, optarg))
@@ -580,16 +571,13 @@ main(int argc, char **argv)
 
 	if (profile) {
 		for (active_profile = profiles; active_profile->name;
-			active_profile++) {
-			if (strcmp(active_profile->name, profile) == 0) {
+		     active_profile++) {
+			if (strcmp(active_profile->name, profile) == 0)
 				break;
-			}
 		}
 	}
-	if (! active_profile->name) {
-		fprintf(stderr, "-P: No such profile '%s'\n", profile);
-		exit(1);
-	}
+	if (!active_profile->name)
+		VUT_Error(1, "-P: No such profile '%s'", profile);
 
 	assert(VUT_Arg(active_profile->VSL_arg, NULL));
 	match_tag = active_profile->tag;
@@ -606,19 +594,15 @@ main(int argc, char **argv)
 		t0 = VTIM_mono();
 
 	format = malloc(4 * fnum);
-	for (i = 0; i < fnum-1; i++) {
-		strcpy(format + 4*i, "%*s ");
-	}
-	strcpy(format + 4*(fnum-1), "%lf");
+	for (i = 0; i < fnum - 1; i++)
+		strcpy(format + 4 * i, "%*s ");
+	strcpy(format + 4 * (fnum - 1), "%lf");
 
 	log_ten = log(10.0);
 
 	VUT_Setup();
-	if (pthread_create(&thr, NULL, do_curses, NULL) != 0) {
-		fprintf(stderr, "pthread_create(): %s\n",
-				strerror(errno));
-		exit(1);
-	}
+	if (pthread_create(&thr, NULL, do_curses, NULL) != 0)
+		VUT_Error(1, "pthread_create(): %s", strerror(errno));
 	VUT.dispatch_f = &accumulate;
 	VUT.dispatch_priv = NULL;
 	VUT.sighup_f = sighup;