[master] ca7a3809b Take relevant from the 6.3 release into trunc

[PÃ¥l Hermunn Johansen]

commit ca7a3809b5c71bc2feb59dfc58af91db876b0fcf
Author: Pål Hermunn Johansen <hermunn at varnish-software.com>
Date:   Mon Sep 16 13:58:54 2019 +0200

    Take relevant from the 6.3 release into trunc
    
    To be exact: Update Via header, copyright year.
    
    See 0c9a93f1b2c6de49b8c6ec8cefd9d2be50041d79.

diff --git a/bin/varnishd/cache/cache_req_fsm.c b/bin/varnishd/cache/cache_req_fsm.c
index d4b343b46..a8ee9c61b 100644
--- a/bin/varnishd/cache/cache_req_fsm.c
+++ b/bin/varnishd/cache/cache_req_fsm.c
@@ -148,7 +148,7 @@ cnt_deliver(struct worker *wrk, struct req *req)
 	http_PrintfHeader(req->resp, "Age: %.0f",
 	    floor(fmax(0., req->t_prev - req->objcore->t_origin)));
 
-	http_SetHeader(req->resp, "Via: 1.1 varnish (Varnish/6.2)");
+	http_SetHeader(req->resp, "Via: 1.1 varnish (Varnish/6.3)");
 
 	if (cache_param->http_gzip_support &&
 	    ObjCheckFlag(req->wrk, req->objcore, OF_GZIPED) &&
diff --git a/configure.ac b/configure.ac
index fbfea3e45..135d73673 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ(2.59)
 AC_COPYRIGHT([Copyright (c) 2006 Verdens Gang AS
-Copyright (c) 2006-2018 Varnish Software])
+Copyright (c) 2006-2019 Varnish Software])
 AC_REVISION([$Id$])
 AC_INIT([Varnish], [trunk], [varnish-dev at varnish-cache.org])
 AC_CONFIG_SRCDIR(include/miniobj.h)
diff --git a/doc/sphinx/index.rst b/doc/sphinx/index.rst
index 9a708b593..e86d038fe 100644
--- a/doc/sphinx/index.rst
+++ b/doc/sphinx/index.rst
@@ -37,7 +37,7 @@ Longer listings like example command output and VCL look like this::
     $ /opt/varnish/sbin/varnishd -V
     varnishd (varnish-trunk revision 199de9b)
     Copyright (c) 2006 Verdens Gang AS
-    Copyright (c) 2006-2018 Varnish Software AS
+    Copyright (c) 2006-2019 Varnish Software AS
 
 
 .. For maintainers: