Merge tag 'varnish-7.0.0'

Releasing 7.0.0

bin/varnishd/cache/cache_req_fsm.c

@@ -166,7 +166,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.6)");
+	http_SetHeader(h, "Via: 1.1 varnish (Varnish/7.0)");
 
 	if (cache_param->http_gzip_support &&
 	    ObjCheckFlag(req->wrk, oc, OF_GZIPED) &&

doc/sphinx/index.rst

@@ -40,9 +40,9 @@ Conventions used in this manual include:
 Longer listings like example command output and VCL look like this::
 
     $ /opt/varnish/sbin/varnishd -V
-    varnishd (varnish-trunk revision 199de9b)
+    varnishd (varnish-trunk revision 1234567)
     Copyright (c) 2006 Verdens Gang AS
-    Copyright (c) 2006-2020 Varnish Software
+    Copyright (c) 2006-2021 Varnish Software
 
 
 .. For maintainers:

doc/sphinx/whats-new/changes-trunk.rst → doc/sphinx/whats-new/changes-7.0.rst

@@ -3,18 +3,14 @@
 	SPDX-License-Identifier: BSD-2-Clause
 	See LICENSE file for full text of license
 
-**Note: This is a working document for a future release, with running
-updates for changes in the development branch. For changes in the
-released versions of Varnish, see:** :ref:`whats-new-index`
+.. _whatsnew_changes_7.0:
 
-.. _whatsnew_changes_CURRENT:
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-Changes in Varnish **$NEXT_RELEASE**
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%
+Changes in Varnish 7.0
+%%%%%%%%%%%%%%%%%%%%%%
 
 For information about updating your current Varnish deployment to the
-new version, see :ref:`whatsnew_upgrading_CURRENT`.
+new version, see :ref:`whatsnew_upgrading_7.0`.
 
 A more detailed and technical account of changes in Varnish, with
 links to issues that have been fixed and pull requests that have been

doc/sphinx/whats-new/index.rst

@@ -13,18 +13,14 @@ This section describes the changes and improvements between different
 versions of Varnish, and what upgrading between the different versions
 entail.
 
-Varnish **$NEXT_RELEASE**
--------------------------
-
-**Note: These are working documents for a future release, with running
-updates for changes in the development branch. For changes in the
-released versions of Varnish, see the chapters listed below.**
+Varnish 7.0
+-----------
 
 .. toctree::
    :maxdepth: 2
 
-   changes-trunk
-   upgrading-trunk
+   changes-7.0
+   upgrading-7.0
 
 Varnish 6.6
 -----------

doc/sphinx/whats-new/upgrading-trunk.rst → doc/sphinx/whats-new/upgrading-7.0.rst

@@ -3,15 +3,11 @@
 	SPDX-License-Identifier: BSD-2-Clause
 	See LICENSE file for full text of license
 
-**Note: This is a working document for a future release, with running
-updates for changes in the development branch. For changes in the
-released versions of Varnish, see:** :ref:`whats-new-index`
+.. _whatsnew_upgrading_7.0:
 
-.. _whatsnew_upgrading_CURRENT:
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-Upgrading to Varnish **$NEXT_RELEASE**
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%
+Upgrading to Varnish 7.0
+%%%%%%%%%%%%%%%%%%%%%%%%
 
 PCRE2
 =====

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
  *
- * NEXT (2021-09-15)
+ * 14.0 (2021-09-15)
  *	VIN_n_Arg() no directly returns the directory name.
  *	VSB_new() and VSB_delete() removed
  *	VCL_STRINGLIST, vrt_magic_string_end removed
@@ -225,7 +225,7 @@
  *	vrt_acl type added
  */
 
-#define VRT_MAJOR_VERSION	13U
+#define VRT_MAJOR_VERSION	14U
 
 #define VRT_MINOR_VERSION	0U
 

lib/libvarnish/version.c

@@ -74,7 +74,7 @@ VCS_String(const char *which)
 		    ")"
 		    "\n"
 		    "Copyright (c) 2006 Verdens Gang AS\n"
-		    "Copyright (c) 2006-2020 Varnish Software\n"
+		    "Copyright (c) 2006-2021 Varnish Software\n"
 		);
 	default:
 		WRONG("Wrong argument to VCS_String");