forked from pool/varnish
Accepting request 1032578 from server:http
- update to 7.2.0: OBS-URL: https://build.opensuse.org/request/show/1032578 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/varnish?expand=0&rev=41
This commit is contained in:
commit
6c4ff67be0
@ -1,164 +0,0 @@
|
||||
From: antoine.belvire@opensuse.org
|
||||
Date: Fri Jun 23 19:42:07 UTC 2017
|
||||
|
||||
GCC 7 introduces new warnings, including implicit fallthrough in switch blocks;
|
||||
see https://gcc.gnu.org/gcc-7/changes.html#c-family. This warnings are turned
|
||||
into errors in our case (-Werror).
|
||||
|
||||
This patch adds comments to make fallthroughs explicit and thus avoids compiler
|
||||
warnings.
|
||||
|
||||
Note that most of these warnings are located in lib/libvgz, which will be
|
||||
upgraded in a future release (see commit 5fae561 on master branch at
|
||||
https://github.com/varnishcache/varnish-cache/commit/5fae561).
|
||||
|
||||
---
|
||||
bin/varnishadm/varnishadm.c | 1 +
|
||||
lib/libvgz/inflate.c | 18 ++++++++++++++++++
|
||||
2 files changed, 19 insertions(+)
|
||||
|
||||
Index: varnish-6.2.0/bin/varnishadm/varnishadm.c
|
||||
===================================================================
|
||||
--- varnish-6.2.0.orig/bin/varnishadm/varnishadm.c
|
||||
+++ varnish-6.2.0/bin/varnishadm/varnishadm.c
|
||||
@@ -439,6 +439,7 @@ main(int argc, char * const *argv)
|
||||
case 'h':
|
||||
/* Usage help */
|
||||
usage(0);
|
||||
+ break;
|
||||
case 'n':
|
||||
n_arg = optarg;
|
||||
break;
|
||||
Index: varnish-6.2.0/lib/libvgz/inflate.c
|
||||
===================================================================
|
||||
--- varnish-6.2.0.orig/lib/libvgz/inflate.c
|
||||
+++ varnish-6.2.0/lib/libvgz/inflate.c
|
||||
@@ -747,6 +747,7 @@ int flush;
|
||||
CRC2(state->check, hold);
|
||||
INITBITS();
|
||||
state->mode = EXLEN;
|
||||
+ /* FALLTHROUGH */
|
||||
case EXLEN:
|
||||
if (state->flags & 0x0400) {
|
||||
NEEDBITS(16);
|
||||
@@ -760,6 +761,7 @@ int flush;
|
||||
else if (state->head != Z_NULL)
|
||||
state->head->extra = Z_NULL;
|
||||
state->mode = EXTRA;
|
||||
+ /* FALLTHROUGH */
|
||||
case EXTRA:
|
||||
if (state->flags & 0x0400) {
|
||||
copy = state->length;
|
||||
@@ -782,6 +784,7 @@ int flush;
|
||||
}
|
||||
state->length = 0;
|
||||
state->mode = NAME;
|
||||
+ /* FALLTHROUGH */
|
||||
case NAME:
|
||||
if (state->flags & 0x0800) {
|
||||
if (have == 0) goto inf_leave;
|
||||
@@ -803,6 +806,7 @@ int flush;
|
||||
state->head->name = Z_NULL;
|
||||
state->length = 0;
|
||||
state->mode = COMMENT;
|
||||
+ /* FALLTHROUGH */
|
||||
case COMMENT:
|
||||
if (state->flags & 0x1000) {
|
||||
if (have == 0) goto inf_leave;
|
||||
@@ -823,6 +827,7 @@ int flush;
|
||||
else if (state->head != Z_NULL)
|
||||
state->head->comment = Z_NULL;
|
||||
state->mode = HCRC;
|
||||
+ /* FALLTHROUGH */
|
||||
case HCRC:
|
||||
if (state->flags & 0x0200) {
|
||||
NEEDBITS(16);
|
||||
@@ -846,6 +851,7 @@ int flush;
|
||||
strm->adler = state->check = ZSWAP32(hold);
|
||||
INITBITS();
|
||||
state->mode = DICT;
|
||||
+ /* FALLTHROUGH */
|
||||
case DICT:
|
||||
if (state->havedict == 0) {
|
||||
RESTORE();
|
||||
@@ -853,8 +859,10 @@ int flush;
|
||||
}
|
||||
strm->adler = state->check = adler32(0L, Z_NULL, 0);
|
||||
state->mode = TYPE;
|
||||
+ /* FALLTHROUGH */
|
||||
case TYPE:
|
||||
if (flush == Z_BLOCK || flush == Z_TREES) goto inf_leave;
|
||||
+ /* FALLTHROUGH */
|
||||
case TYPEDO:
|
||||
if (strm->start_bit == 0)
|
||||
strm->start_bit = 8 * (strm->total_in + in - have) - bits;
|
||||
@@ -910,8 +918,10 @@ int flush;
|
||||
INITBITS();
|
||||
state->mode = COPY_;
|
||||
if (flush == Z_TREES) goto inf_leave;
|
||||
+ /* FALLTHROUGH */
|
||||
case COPY_:
|
||||
state->mode = COPY;
|
||||
+ /* FALLTHROUGH */
|
||||
case COPY:
|
||||
copy = state->length;
|
||||
if (copy) {
|
||||
@@ -1051,8 +1061,10 @@ int flush;
|
||||
Tracev((stderr, "inflate: codes ok\n"));
|
||||
state->mode = LEN_;
|
||||
if (flush == Z_TREES) goto inf_leave;
|
||||
+ /* FALLTHROUGH */
|
||||
case LEN_:
|
||||
state->mode = LEN;
|
||||
+ /* FALLTHROUGH */
|
||||
case LEN:
|
||||
if (have >= 6 && left >= 258) {
|
||||
RESTORE();
|
||||
@@ -1102,6 +1114,7 @@ int flush;
|
||||
}
|
||||
state->extra = (unsigned)(here.op) & 15;
|
||||
state->mode = LENEXT;
|
||||
+ /* FALLTHROUGH */
|
||||
case LENEXT:
|
||||
if (state->extra) {
|
||||
NEEDBITS(state->extra);
|
||||
@@ -1112,6 +1125,7 @@ int flush;
|
||||
Tracevv((stderr, "inflate: length %u\n", state->length));
|
||||
state->was = state->length;
|
||||
state->mode = DIST;
|
||||
+ /* FALLTHROUGH */
|
||||
case DIST:
|
||||
for (;;) {
|
||||
here = state->distcode[BITS(state->distbits)];
|
||||
@@ -1139,6 +1153,7 @@ int flush;
|
||||
state->offset = (unsigned)here.val;
|
||||
state->extra = (unsigned)(here.op) & 15;
|
||||
state->mode = DISTEXT;
|
||||
+ /* FALLTHROUGH */
|
||||
case DISTEXT:
|
||||
if (state->extra) {
|
||||
NEEDBITS(state->extra);
|
||||
@@ -1155,6 +1170,7 @@ int flush;
|
||||
#endif
|
||||
Tracevv((stderr, "inflate: distance %u\n", state->offset));
|
||||
state->mode = MATCH;
|
||||
+ /* FALLTHROUGH */
|
||||
case MATCH:
|
||||
if (left == 0) goto inf_leave;
|
||||
copy = out - left;
|
||||
@@ -1230,6 +1246,7 @@ int flush;
|
||||
}
|
||||
#ifdef GUNZIP
|
||||
state->mode = LENGTH;
|
||||
+ /* FALLTHROUGH */
|
||||
case LENGTH:
|
||||
if (state->wrap && state->flags) {
|
||||
NEEDBITS(32);
|
||||
@@ -1243,6 +1260,7 @@ int flush;
|
||||
}
|
||||
#endif
|
||||
state->mode = DONE;
|
||||
+ /* FALLTHROUGH */
|
||||
case DONE:
|
||||
ret = Z_STREAM_END;
|
||||
goto inf_leave;
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:2cafbe2590e7d58a7bac8ad99be92e440fe4d38ada6816dd8836f22fa513a190
|
||||
size 3742869
|
3
varnish-7.2.0.tgz
Normal file
3
varnish-7.2.0.tgz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1da8a97ed5f7b7d4d5e04fc5c96fc9a85cb3a20d076eba2b18951f4b306c9686
|
||||
size 4018697
|
@ -1,3 +1,83 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat Oct 29 13:43:46 UTC 2022 - Dirk Müller <dmueller@suse.com>
|
||||
|
||||
- update to 7.2.0:
|
||||
* Functions ``VRT_AddVDP()``, ``VRT_AddVFP()``,
|
||||
``VRT_RemoveVDP()`` and ``VRT_RemoveVFP()`` are deprecated.
|
||||
* Cookie headers generated by vmod_cookie no longer have a
|
||||
spurious trailing semicolon at the end of the string. This
|
||||
could break VCL relying on the previous incorrect behavior.
|
||||
* The ``SessClose`` and ``BackendClose`` reason ``rx_body``,
|
||||
which previously output ``Failure receiving req.body``, has
|
||||
been rewritten to ``Failure receiving body``.
|
||||
* Prototypical Varnish Extensions (VEXT). Similar to VMODs, a
|
||||
VEXT is loaded by the cache process. Unlike VMODs that have
|
||||
the combined lifetime of all the VCLs that reference them, a
|
||||
VEXT has the lifetime of the cache process itself. There are
|
||||
no built-in extensions so far.
|
||||
* Duration parameters can optionally take a unit, with the same
|
||||
syntax as duration units in VCL.
|
||||
* Calls to ``VRT_CacheReqBody()`` and ``std.cache_req_body``
|
||||
from outside client vcl subs now fail properly instead of
|
||||
triggering an assertion failure.
|
||||
* New "B" string for the package branch in ``VCS_String()``.
|
||||
For the 7.2.0 version, it would yield the 7.2 branch.
|
||||
* The new ``vcc_feature`` bits parameter replaces previous
|
||||
``vcc_*`` boolean parameters. The latter still exist as
|
||||
deprecated aliases.
|
||||
* The ``-k`` option from ``varnishlog`` is now supported by
|
||||
``varnishncsa``.
|
||||
* New functions ``std.now()`` and ``std.timed_call()`` in
|
||||
vmod_std.
|
||||
* New ``MAIN.shm_bytes`` counter.
|
||||
* A ``req.http.via`` header is set before entering
|
||||
``vcl_recv``. Via headers are generated using the
|
||||
``server.identity`` value. It defaults to the host name and
|
||||
can be turned into a pseudonym with the ``varnishd -i``
|
||||
option. Via headers are appended in both directions, to work
|
||||
with other hops that may advertise themselves.
|
||||
* A ``resp.http.via`` header is no longer overwritten by
|
||||
varnish, but rather appended to.
|
||||
* The ``server.identity`` syntax is now limited to a "token" as
|
||||
defined in the HTTP grammar to be suitable for Via headers.
|
||||
* In ``varnishtest`` a Varnish instance will use its VTC
|
||||
instance name as its instance name (``varnishd -i``) by
|
||||
default for predictable Via headers in test cases.
|
||||
* VMOD and VEXT authors can use functions from ``vnum.h``.
|
||||
* Do not filter pseudo-headers as regular headers.
|
||||
* The termination rules for ``WRK_BgThread()`` were relaxed to
|
||||
allow VMODs to use it.
|
||||
* ``(struct worker).handling`` has been moved to the newly
|
||||
introduced ``struct wrk_vpi`` and replaced by a pointer to
|
||||
it, as well as ``(struct vrt_ctx).handling`` has been
|
||||
replaced by that pointer. ``struct wrk_vpi`` is for state at
|
||||
the interface between VRT and VGC and, in particular, is not
|
||||
const as ``struct vrt_ctx`` aka ``VRT_CTX``.
|
||||
* Panics now contain information about VCL source files and
|
||||
lines.
|
||||
* The ``Begin`` log record has a 4th field for subtasks like
|
||||
ESI sub-requests.
|
||||
* The ``-E`` option for log utilities now works as documented,
|
||||
with any type of sub-task based on the ``Begin[4]`` field.
|
||||
This covers ESI like before, and sub-tasks spawned by VMODs
|
||||
(provided that they log the new field).
|
||||
* No more ``req.http.transfer-encoding`` for ESI sub-requests.
|
||||
* The thread pool reserve is now limited to tasks that can be
|
||||
queued. A backend background fetch is no longer eligible for
|
||||
queueing. It would otherwise slow a grace hit down
|
||||
significantly when thread pools are saturated.
|
||||
* The unused ``fetch_no_thread`` counter was renamed to
|
||||
``bgfetch_no_thread`` because regular backend fetch tasks are
|
||||
always scheduled.
|
||||
* The macros ``FEATURE()``, ``EXPERIMENT()``, ``DO_DEBUG()``,
|
||||
``MGT_FEATURE()``, ``MGT_EXPERIMENT()``, ``MGT_DO_DEBUG()``
|
||||
and ``MGT_VCC_FEATURE()`` now return a boolean value (``0``
|
||||
or ``1``) instead of the (private) flag value.
|
||||
* A regression in the transport code led MAIN.client_req to be
|
||||
incremented for requests coming back from the waiting list,
|
||||
it was fixed.
|
||||
- Delete varnish-5.1.2-add-fallthrough-comments.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Sep 21 08:10:13 UTC 2022 - Bernhard Wiedemann <bwiedemann@suse.com>
|
||||
|
||||
|
@ -25,7 +25,7 @@
|
||||
%define _fillupdir %_localstatedir/adm/fillup-templates
|
||||
%endif
|
||||
Name: varnish
|
||||
Version: 7.1.1
|
||||
Version: 7.2.0
|
||||
Release: 0
|
||||
Summary: Accelerator for HTTP services
|
||||
License: BSD-2-Clause
|
||||
@ -38,7 +38,6 @@ Source5: varnish.logrotate
|
||||
Source7: varnish.service
|
||||
Source8: varnishlog.service
|
||||
Source9: varnish_reload_vcl
|
||||
Patch1: varnish-5.1.2-add-fallthrough-comments.patch
|
||||
Patch2: uninit.patch
|
||||
BuildRequires: libxslt-devel
|
||||
BuildRequires: ncurses-devel
|
||||
|
Loading…
Reference in New Issue
Block a user