[master] a67944a Bump the Via header for 5.0

[Poul-Henning Kamp]

commit a67944a5342b6274e460461619977f83eebadb8b
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Sep 12 12:28:14 2016 +0000

    Bump the Via header for 5.0

diff --git a/bin/varnishd/cache/cache_req_fsm.c b/bin/varnishd/cache/cache_req_fsm.c
index e7fec41..bab15ec 100644
--- a/bin/varnishd/cache/cache_req_fsm.c
+++ b/bin/varnishd/cache/cache_req_fsm.c
@@ -94,7 +94,7 @@ cnt_deliver(struct worker *wrk, struct req *req)
 	http_PrintfHeader(req->resp, "Age: %.0f",
 	    fmax(0., req->t_prev - req->objcore->t_origin));
 
-	http_SetHeader(req->resp, "Via: 1.1 varnish-v4");
+	http_SetHeader(req->resp, "Via: 1.1 varnish (Varnish/5.0)");
 
 	if (cache_param->http_gzip_support &&
 	    ObjCheckFlag(req->wrk, req->objcore, OF_GZIPED) &&
diff --git a/bin/varnishtest/tests/b00000.vtc b/bin/varnishtest/tests/b00000.vtc
index 5b464a9..c33038a 100644
--- a/bin/varnishtest/tests/b00000.vtc
+++ b/bin/varnishtest/tests/b00000.vtc
@@ -32,4 +32,4 @@ varnish v1 -expect cache_miss == 1
 varnish v1 -expect s_sess == 1
 varnish v1 -expect s_req == 1
 varnish v1 -expect s_resp_bodybytes == 7
-varnish v1 -expect s_resp_hdrbytes == 167
+varnish v1 -expect s_resp_hdrbytes == 178
diff --git a/bin/varnishtest/tests/e00003.vtc b/bin/varnishtest/tests/e00003.vtc
index ba73c14..0ff09d8 100644
--- a/bin/varnishtest/tests/e00003.vtc
+++ b/bin/varnishtest/tests/e00003.vtc
@@ -30,7 +30,7 @@ varnish v1 -vcl+backend {
 
 logexpect l1 -v v1 -g request {
 	expect 0 1001   Begin   "^req .* rxreq"
-	expect * =	ReqAcct	"^18 0 18 176 75 251$"
+	expect * =	ReqAcct	"^18 0 18 187 75 262$"
 	expect 0 =      End
 } -start
 
@@ -52,7 +52,7 @@ logexpect l4 -v v1 -g request {
 
 logexpect l5 -v v1 -g request {
 	expect * 1005   Begin   "^req .* rxreq"
-	expect * =	ReqAcct	"^18 0 18 181 75 256$"
+	expect * =	ReqAcct	"^18 0 18 192 75 267$"
 	expect 0 =      End
 } -start