[master] 13f137934 Prepare for 6.4.0

[PÃ¥l Hermunn Johansen]

commit 13f137934ec1cf14af66baf7896311115ee35598
Author: Pål Hermunn Johansen <hermunn at varnish-software.com>
Date:   Mon Mar 16 12:53:35 2020 +0100

    Prepare for 6.4.0

diff --git a/bin/varnishd/cache/cache_req_fsm.c b/bin/varnishd/cache/cache_req_fsm.c
index 3829b6292..aee7140c6 100644
--- a/bin/varnishd/cache/cache_req_fsm.c
+++ b/bin/varnishd/cache/cache_req_fsm.c
@@ -141,7 +141,7 @@ Resp_Setup_Deliver(struct req *req)
 	http_PrintfHeader(h, "Age: %.0f",
 	    floor(fmax(0., req->t_prev - oc->t_origin)));
 
-	http_SetHeader(h, "Via: 1.1 varnish (Varnish/6.3)");
+	http_SetHeader(h, "Via: 1.1 varnish (Varnish/6.4)");
 
 	if (cache_param->http_gzip_support &&
 	    ObjCheckFlag(req->wrk, oc, OF_GZIPED) &&
diff --git a/configure.ac b/configure.ac
index 87fe4b11f..dd43dc82f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 AC_PREREQ(2.59)
 AC_COPYRIGHT([Copyright (c) 2006 Verdens Gang AS
-Copyright (c) 2006-2019 Varnish Software])
+Copyright (c) 2006-2020 Varnish Software])
 AC_REVISION([$Id$])
-AC_INIT([Varnish], [trunk], [varnish-dev at varnish-cache.org])
+AC_INIT([Varnish], [6.4.0], [varnish-dev at varnish-cache.org])
 AC_CONFIG_SRCDIR(include/miniobj.h)
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
diff --git a/doc/changes.rst b/doc/changes.rst
index ebeb7de4a..dc1ceac2a 100644
--- a/doc/changes.rst
+++ b/doc/changes.rst
@@ -50,8 +50,6 @@ Varnish Cache 6.4.0 (2019-09-16)
   director, which, amongst other advantages, offers more stable
   backend selection through consistent hashing.
 
-.. do we want to mention VSV00004 ?
-
 * Log records can safely have empty fields or fields containing blanks if
   they are delimited by "double quotes". This was applied to ``SessError``
   and ``Backend_health``.
@@ -60,9 +58,6 @@ Varnish Cache 6.4.0 (2019-09-16)
   of a dynamic backend. A hash is now computed to determine uniqueness and
   a backend declaration can contribute arbitrary data to influence the pool.
 
-.. 3109 (vdp gunzip) is probably irrelevant for users because it only
-   happens with gzip objects inserted bypassing the built-in vfps
-
 * The option ``varnishtest -W`` is gone, the same can be achieved with
   ``varnishtest -p debug=+witness``. A ``witness.sh`` script is available
   in the source tree to generate a graphviz dot file and detect potential
@@ -130,8 +125,6 @@ Varnish Cache 6.4.0 (2019-09-16)
 * Always refer to ``sub`` as subroutine in the documentation and error
   messages to avoid confusion with other terms.
 
-.. mention #3176? (backend cooling straightened out)
-
 * New ``pid`` command in the Varnish CLI, to get the master and optionally
   cache process PIDs, for example from ``varnishadm``.
 
diff --git a/doc/sphinx/index.rst b/doc/sphinx/index.rst
index e86d038fe..e5c33b1e4 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-2019 Varnish Software AS
+    Copyright (c) 2006-2020 Varnish Software AS
 
 
 .. For maintainers:
diff --git a/include/vrt.h b/include/vrt.h
index 2baea19a8..6d5dcdc93 100644
--- a/include/vrt.h
+++ b/include/vrt.h
@@ -53,7 +53,7 @@
  * Whenever something is deleted or changed in a way which is not
  * binary/load-time compatible, increment MAJOR version
  *
- * unreleased (planned for 2020-03-15)
+ * 11.0 (2020-03-16)
  *	Changed type of vsa_suckaddr_len from int to size_t
  *	New prefix_{ptr|len} fields in vrt_backend
  *	VRT_HashStrands32() added
@@ -159,7 +159,7 @@
  *	vrt_acl type added
  */
 
-#define VRT_MAJOR_VERSION	10U
+#define VRT_MAJOR_VERSION	11U
 
 #define VRT_MINOR_VERSION	0U
 
diff --git a/lib/libvarnish/version.c b/lib/libvarnish/version.c
index d2e344f7e..f54e78407 100644
--- a/lib/libvarnish/version.c
+++ b/lib/libvarnish/version.c
@@ -74,7 +74,7 @@ VCS_String(const char *which)
 		    ")"
 		    "\n"
 		    "Copyright (c) 2006 Verdens Gang AS\n"
-		    "Copyright (c) 2006-2019 Varnish Software AS\n"
+		    "Copyright (c) 2006-2020 Varnish Software AS\n"
 		);
 	default:
 		WRONG("Wrong argument to VCS_String");