Merge tag 'varnish-7.6.0'

varnishcache · Sep 13, 2024 · 8f11d01 · 8f11d01
2 parents 168ebab + ed1243c
commit 8f11d01
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 42 deletions.
diff --git a/bin/varnishtest/tests/m00003.vtc b/bin/varnishtest/tests/m00003.vtc
@@ -96,7 +96,7 @@ filewrite -a ${tmpdir}/libvmod_wrong.so "\x03"
 varnish v1 -errvcl {VMOD wants ABI version 1.0} { import wrong; }
 
 #############################################################
-# NB: in the tests below "19" should track VRT_MAJOR_VERSION
+# NB: in the tests below "20" should track VRT_MAJOR_VERSION
 
 filewrite ${tmpdir}/libvmod_wrong.so "VMOD_JSON_SPEC\x02"
 filewrite -a ${tmpdir}/libvmod_wrong.so {
@@ -108,7 +108,7 @@ filewrite -a ${tmpdir}/libvmod_wrong.so {
 	    "Vmod_vmod_wrong_Func",
 	    "0000000000000000000000000000000000000000000000000000000000000000",
 	    "0000000000000000000000000000000000000000000000000000000000000000",
-	    "19",
+	    "20",
 	    "0"
 	], [
 	    "$FOOBAR"
@@ -128,7 +128,7 @@ filewrite -a ${tmpdir}/libvmod_wrong.so {
 	    "Vmod_vmod_wrong_Func",
 	    "0000000000000000000000000000000000000000000000000000000000000000",
 	    "0000000000000000000000000000000000000000000000000000000000000000",
-	    "19",
+	    "20",
 	    "0"
 	]
     ]
@@ -146,7 +146,7 @@ filewrite -a ${tmpdir}/libvmod_wrong.so {
 	    "Vmod_vmod_wrong_Func",
 	    "0000000000000000000000000000000000000000000000000000000000000000",
 	    "0000000000000000000000000000000000000000000000000000000000000000",
-	    "19",
+	    "20",
 	    "0"
 	], [
 	    "$CPROTO"
@@ -168,7 +168,7 @@ filewrite -a ${tmpdir}/libvmod_wrong.so {
 	    "Vmod_vmod_std_Func",
 	    "0000000000000000000000000000000000000000000000000000000000000000",
 	    "0000000000000000000000000000000000000000000000000000000000000000",
-	    "19",
+	    "20",
 	    "0"
 	], [
 	    "$CPROTO", "/* blabla */"

diff --git a/bin/varnishtest/tests/m00055.vtc b/bin/varnishtest/tests/m00055.vtc
@@ -21,7 +21,7 @@ filewrite -a ${tmpdir}/libvmod_wrong.so {
 	    "Vmod_vmod_wrong_Func",
 	    "0000000000000000000000000000000000000000000000000000000000000000",
 	    "0000000000000000000000000000000000000000000000000000000000000000",
-	    "19",
+	    "20",
 	    "0"
 	],
 	[

diff --git a/doc/changes.rst b/doc/changes.rst
@@ -34,9 +34,9 @@ http://varnish-cache.org/docs/trunk/whats-new/index.html and via
 individual releases. These documents are updated as part of the
 release process.
 
-===============================
-Varnish Cache NEXT (2024-09-15)
-===============================
+================================
+Varnish Cache 7.6.0 (2024-09-13)
+================================
 
 .. PLEASE keep this roughly in commit order as shown by git-log / tig
    (new to old)

diff --git a/doc/sphinx/whats-new/changes-trunk.rst → doc/sphinx/whats-new/changes-7.6.rst b/doc/sphinx/whats-new/changes-trunk.rst → doc/sphinx/whats-new/changes-7.6.rst
@@ -1,11 +1,11 @@
-.. _whatsnew_changes_CURRENT:
+.. _whatsnew_changes_7.6:
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-Changes in Varnish **${NEXT_RELEASE}**
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%
+Changes in Varnish 7.6
+%%%%%%%%%%%%%%%%%%%%%%
 
 For information about updating your current Varnish deployment to the
-new version, see :ref:`whatsnew_upgrading_CURRENT`.
+new version, see :ref:`whatsnew_upgrading_7.6`.
 
 A more detailed and technical account of changes in Varnish, with
 links to issues that have been fixed and pull requests that have been
@@ -25,14 +25,14 @@ varnishd
 
 A new ``linux`` jail has been added (configured via the ``-j`` argument) which is
 now the default on Linux. For now, it is almost identical to the ``unix`` jail
-with one :ref:`whatsnew_upgrading_CURRENT_linux_jail` added.
+with one :ref:`whatsnew_upgrading_7.6_linux_jail` added.
 
 The port of a *listen_endpoint* given with the ``-a`` argument to ``varnishd``
 can now also be a numerical port range like ``80-89``, besides the existing
 options of port number (e.g. ``80``) and service name (e.g. ``http``). With a
 port range, Varnish will accept connections on all ports within the range.
 
-.. _whatsnew_changes_CURRENT_connq:
+.. _whatsnew_changes_7.6_connq:
 
 Backend connection queuing
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -62,7 +62,7 @@ Parameters
 ~~~~~~~~~~
 
 The ``backend_wait_timeout`` and ``backend_wait_limit`` parameters have been
-added, see :ref:`whatsnew_changes_CURRENT_connq` above for details.
+added, see :ref:`whatsnew_changes_7.6_connq` above for details.
 
 The size of the buffer to hold panic messages is now tunable through the new
 ``panic_buffer`` parameter.
@@ -71,7 +71,7 @@ Changes to VCL
 ==============
 
 The ``wait_timeout`` and ``wait_limit`` backend properties have been added, see
-:ref:`whatsnew_changes_CURRENT_connq` above for details.
+:ref:`whatsnew_changes_7.6_connq` above for details.
 
 For backends using the ``.via`` attribute to connect through a *proxy*, the
 ``connect_timeout``, ``first_byte_timeout`` and ``between_bytes_timeout``
@@ -97,7 +97,7 @@ VSC counters for waiters have been added:
 These can be found under ``WAITER.<poolname>.``.
 
 The ``MAIN.backend_wait`` and ``MAIN.backend_wait_fail`` counters have been
-added, see :ref:`whatsnew_changes_CURRENT_connq` above for details.
+added, see :ref:`whatsnew_changes_7.6_connq` above for details.
 
 varnishtest
 ===========
@@ -108,7 +108,7 @@ varnishtest
 Changes for developers and VMOD authors
 =======================================
 
-.. _whatsnew_changes_CURRENT_VDP:
+.. _whatsnew_changes_7.6_VDP:
 
 VDP filter API changes
 ~~~~~~~~~~~~~~~~~~~~~~
@@ -143,7 +143,7 @@ VDPs with no ``vdp_bytes_f`` function are now supported if the ``vdp_init_f``
 returns a value greater than zero to signify that the filter is not to be added
 to the chain. This is useful to support VDPs which only need to work on headers.
 
-.. _whatsnew_changes_CURRENT_Obj:
+.. _whatsnew_changes_7.6_Obj:
 
 Object API changes
 ~~~~~~~~~~~~~~~~~~

diff --git a/doc/sphinx/whats-new/index.rst b/doc/sphinx/whats-new/index.rst
@@ -13,8 +13,8 @@ This section describes the changes and improvements between different
 versions of Varnish, and what upgrading between the different versions
 entail.
 
-Varnish **$NEXT_RELEASE**
--------------------------
+Varnish 7.6
+-----------
 
 **Note: These are working documents for a future release, with running
 updates for changes in the development branch. For changes in the
@@ -23,11 +23,11 @@ released versions of Varnish, see the chapters listed below.**
 .. toctree::
    :maxdepth: 2
 
-   changes-trunk
-   upgrading-trunk
+   changes-7.6
+   upgrading-7.6
 
-Varnish **7.5**
----------------
+Varnish 7.5
+-----------
 
 .. toctree::
    :maxdepth: 2

diff --git a/doc/sphinx/whats-new/upgrading-trunk.rst → doc/sphinx/whats-new/upgrading-7.6.rst b/doc/sphinx/whats-new/upgrading-trunk.rst → doc/sphinx/whats-new/upgrading-7.6.rst
@@ -1,14 +1,10 @@
-**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.6:
 
-.. _whatsnew_upgrading_CURRENT:
+%%%%%%%%%%%%%%%%%%%%%%%%
+Upgrading to Varnish 7.6
+%%%%%%%%%%%%%%%%%%%%%%%%
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-Upgrading to Varnish **$NEXT_RELEASE**
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-In general, upgrading from Varnish 7.5 to **$NEXT_RELEASE** should not require any changes
+In general, upgrading from Varnish 7.5 to 7.6 should not require any changes
 besides the actual upgrade.
 
 The changes mentioned below are considered noteworthy nevertheless:
@@ -27,7 +23,7 @@ as set via ``ulimit -l`` or ``LimitMEMLOCK`` with ``systemd(1)``. This is not
 new at all, just now the warning has been added to make administrators more
 aware.
 
-.. _whatsnew_upgrading_CURRENT_linux_jail:
+.. _whatsnew_upgrading_7.6_linux_jail:
 
 Warning if tmpfs is not used
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -54,10 +50,10 @@ the ``builtin.vcl`` only and users hitting this issue are advised to call
 Changes for developers and VMOD authors
 =======================================
 
-The VDP filter API has changed. See :ref:`whatsnew_changes_CURRENT_VDP` for details.
+The VDP filter API has changed. See :ref:`whatsnew_changes_7.6_VDP` for details.
 
 The signature of ``ObjWaitExtend()`` has changed. See
-:ref:`whatsnew_changes_CURRENT_Obj` for details.
+:ref:`whatsnew_changes_7.6_Obj` for details.
 
 ``varnishd`` now creates a ``worker_tmpdir`` which can be used by VMODs for
 temporary files. See :ref:`ref-vmod-event-functions` for details.

diff --git a/include/vrt.h b/include/vrt.h
@@ -46,9 +46,9 @@
 #  error "include vdef.h before vrt.h"
 #endif
 
-#define VRT_MAJOR_VERSION	19U
+#define VRT_MAJOR_VERSION	20U
 
-#define VRT_MINOR_VERSION	1U
+#define VRT_MINOR_VERSION	0U
 
 /***********************************************************************
  * Major and minor VRT API versions.
@@ -57,7 +57,7 @@
  * Whenever something is deleted or changed in a way which is not
  * binary/load-time compatible, increment MAJOR version
  *
- * NEXT (2024-09-15)
+ * 20.0 (2024-09-13)
  *	struct vrt_backend.backend_wait_timeout added
  *	struct vrt_backend.backend_wait_limit  added
  * 19.1 (2024-05-27)
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,7 +21,7 @@ filewrite -a ${tmpdir}/libvmod_wrong.so { @@
     	    "Vmod_vmod_wrong_Func",
     	    "0000000000000000000000000000000000000000000000000000000000000000",
     	    "0000000000000000000000000000000000000000000000000000000000000000",
-    	    "19",
+    	    "20",
     	    "0"
     	],
     	[
@@ Expand Down @@