diff --git a/bin/varnishtest/tests/m00003.vtc b/bin/varnishtest/tests/m00003.vtc index 1b6a90faa6..7130e90bb3 100644 --- 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 "18" should track VRT_MAJOR_VERSION +# NB: in the tests below "19" 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", - "18", + "19", "0" ], [ "$FOOBAR" @@ -128,7 +128,7 @@ filewrite -a ${tmpdir}/libvmod_wrong.so { "Vmod_vmod_wrong_Func", "0000000000000000000000000000000000000000000000000000000000000000", "0000000000000000000000000000000000000000000000000000000000000000", - "18", + "19", "0" ] ] @@ -146,7 +146,7 @@ filewrite -a ${tmpdir}/libvmod_wrong.so { "Vmod_vmod_wrong_Func", "0000000000000000000000000000000000000000000000000000000000000000", "0000000000000000000000000000000000000000000000000000000000000000", - "18", + "19", "0" ], [ "$CPROTO" @@ -168,7 +168,7 @@ filewrite -a ${tmpdir}/libvmod_wrong.so { "Vmod_vmod_std_Func", "0000000000000000000000000000000000000000000000000000000000000000", "0000000000000000000000000000000000000000000000000000000000000000", - "18", + "19", "0" ], [ "$CPROTO", "/* blabla */" diff --git a/bin/varnishtest/tests/m00055.vtc b/bin/varnishtest/tests/m00055.vtc index f79182b8ad..7d8f9afa91 100644 --- 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", - "18", + "19", "0" ], [ diff --git a/configure.ac b/configure.ac index adb25c7134..f9e9666e6f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,9 +1,9 @@ AC_PREREQ([2.69]) AC_COPYRIGHT([Copyright (c) 2006 Verdens Gang AS -Copyright (c) 2006-2023 Varnish Software -Copyright 2010-2023 UPLEX - Nils Goroll Systemoptimierung]) +Copyright (c) 2006-2024 Varnish Software +Copyright 2010-2024 UPLEX - Nils Goroll Systemoptimierung]) AC_REVISION([$Id$]) -AC_INIT([Varnish],[trunk],[varnish-dev@varnish-cache.org]) +AC_INIT([Varnish],[7.5.0],[varnish-dev@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 3aa1b6d368..aeda844ff0 100644 --- a/doc/changes.rst +++ b/doc/changes.rst @@ -34,13 +34,15 @@ 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-03-15) -=============================== +================================ +Varnish Cache 7.5.0 (2024-03-18) +================================ .. PLEASE keep this roughly in commit order as shown by git-log / tig (new to old) +* Add ``h2_window_timeout`` paramater to mitigate CVE-2023-43622 (VSV00014_). + * The parameters ``idle_send_timeout`` and ``timeout_idle`` are now limited to a maximum of 1 hour. @@ -280,6 +282,7 @@ Varnish Cache NEXT (2024-03-15) .. _3997: https://github.com/varnishcache/varnish-cache/pull/3997 .. _3998: https://github.com/varnishcache/varnish-cache/pull/3998 .. _3999: https://github.com/varnishcache/varnish-cache/pull/3999 +.. _VSV00014: https://varnish-cache.org/security/VSV00014.html ================================ Varnish Cache 7.4.0 (2023-09-15) diff --git a/doc/sphinx/index.rst b/doc/sphinx/index.rst index 537c22209b..4899104069 100644 --- a/doc/sphinx/index.rst +++ b/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 1234567) + varnishd (varnish-7.5.0 revision 1234567) Copyright (c) 2006 Verdens Gang AS - Copyright (c) 2006-2023 Varnish Software + Copyright (c) 2006-2024 Varnish Software .. For maintainers: diff --git a/doc/sphinx/whats-new/changes-trunk.rst b/doc/sphinx/whats-new/changes-7.5.rst similarity index 99% rename from doc/sphinx/whats-new/changes-trunk.rst rename to doc/sphinx/whats-new/changes-7.5.rst index 1ed15bf759..3a36a11200 100644 --- a/doc/sphinx/whats-new/changes-trunk.rst +++ b/doc/sphinx/whats-new/changes-7.5.rst @@ -1,11 +1,11 @@ -.. _whatsnew_changes_CURRENT: +.. _whatsnew_changes_7.5: %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -Changes in Varnish **${NEXT_RELEASE}** +Changes in Varnish **7.5** %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% For information about updating your current Varnish deployment to the -new version, see :ref:`whatsnew_upgrading_CURRENT`. +new version, see :ref:`whatsnew_upgrading_7.5`. A more detailed and technical account of changes in Varnish, with links to issues that have been fixed and pull requests that have been diff --git a/doc/sphinx/whats-new/index.rst b/doc/sphinx/whats-new/index.rst index 8b4225c982..51a6b97bde 100644 --- a/doc/sphinx/whats-new/index.rst +++ b/doc/sphinx/whats-new/index.rst @@ -13,7 +13,7 @@ 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.5** ------------------------- **Note: These are working documents for a future release, with running @@ -23,8 +23,8 @@ released versions of Varnish, see the chapters listed below.** .. toctree:: :maxdepth: 2 - changes-trunk - upgrading-trunk + changes-7.5 + upgrading-7.5 Varnish 7.4 ----------- diff --git a/doc/sphinx/whats-new/upgrading-trunk.rst b/doc/sphinx/whats-new/upgrading-7.5.rst similarity index 97% rename from doc/sphinx/whats-new/upgrading-trunk.rst rename to doc/sphinx/whats-new/upgrading-7.5.rst index cc06057751..ac068ec861 100644 --- a/doc/sphinx/whats-new/upgrading-trunk.rst +++ b/doc/sphinx/whats-new/upgrading-7.5.rst @@ -1,7 +1,7 @@ -.. _whatsnew_upgrading_CURRENT: +.. _whatsnew_upgrading_7.5: %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -Upgrading to Varnish **$NEXT_RELEASE** +Upgrading to Varnish **7.5** %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Logs diff --git a/include/vrt.h b/include/vrt.h index 5599ac7c99..0f1df8984b 100644 --- a/include/vrt.h +++ b/include/vrt.h @@ -46,9 +46,9 @@ # error "include vdef.h before vrt.h" #endif -#define VRT_MAJOR_VERSION 18U +#define VRT_MAJOR_VERSION 19U -#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-03-15) + * 19.0 (2024-03-18) * [cache.h] (struct req).filter_list renamed to vdp_filter_list * order of vcl/vmod and director COLD events reversed to directors first * VRT_u_sess_idle_send_timeout() added diff --git a/lib/libvarnish/version.c b/lib/libvarnish/version.c index 0d09ab748b..4f5983c0da 100644 --- a/lib/libvarnish/version.c +++ b/lib/libvarnish/version.c @@ -76,8 +76,8 @@ VCS_String(const char *which) ")" "\n" "Copyright (c) 2006 Verdens Gang AS\n" - "Copyright (c) 2006-2023 Varnish Software\n" - "Copyright 2010-2023 UPLEX - Nils Goroll Systemoptimierung\n" + "Copyright (c) 2006-2024 Varnish Software\n" + "Copyright 2010-2024 UPLEX - Nils Goroll Systemoptimierung\n" ); default: WRONG("Wrong argument to VCS_String");