Hello community,
here is the log from the commit of package varnish.12875 for
openSUSE:Leap:15.1:Update checked in at 2020-06-13 12:17:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.1:Update/varnish.12875 (Old)
and /work/SRC/openSUSE:Leap:15.1:Update/.varnish.12875.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "varnish.12875"
Sat Jun 13 12:17:02 2020 rev:1 rq:813132 version:6.2.1
Changes:
--------
New Changes file:
--- /dev/null 2020-05-28 02:28:09.919761697 +0200
+++ /work/SRC/openSUSE:Leap:15.1:Update/.varnish.12875.new.3606/varnish.changes
2020-06-13 12:17:02.896939939 +0200
@@ -0,0 +1,424 @@
+-------------------------------------------------------------------
+Tue Jun 9 19:37:49 UTC 2020 - Jan Engelhardt <jeng...@inai.de>
+
+- Add 0001-Clear-err_code-and-err_reason-at-start-of-request-ha.patch
+ [CVE-2019-20637, boo#1169040]
+- Add 0001-Handle-badly-formatted-proxy-TLVs.patch
+ [CVE-2020-11653, boo#1169039]
+
+-------------------------------------------------------------------
+Wed Sep 4 10:27:37 UTC 2019 - Jan Engelhardt <jeng...@inai.de>
+
+- Update to release 6.2.1
+ * Bugfix for CVE-2019-15892 [boo#1149382]
+
+-------------------------------------------------------------------
+Mon Aug 26 10:52:05 UTC 2019 - Jan Engelhardt <jeng...@inai.de>
+
+- Add uninit.patch.
+
+-------------------------------------------------------------------
+Wed Mar 27 10:01:08 UTC 2019 - Samu Voutilainen <s...@smar.fi>
+
+- Updated to 6.2.0
+ * Added a thread pool watchdog which will restart the worker
+ process if scheduling tasks onto worker threads appears
+ stuck. The new parameter "thread_pool_watchdog" configures
+ it.
+- Disabled error for clobbering, which caused bogus
+ error in varnishtest
+
+-------------------------------------------------------------------
+Wed May 2 06:47:32 UTC 2018 - jeng...@inai.de
+
+- Put %fillup back into %post
+
+-------------------------------------------------------------------
+Mon Mar 19 22:22:35 UTC 2018 - jeng...@inai.de
+
+- Update to new upstream release 6.0.0
+ * Added support for Unix Domain Sockets, both for clients and
+ for backend servers. This brings a new level of the VCL
+ language, version 4.1.
+ * Always use HTTP/1.1 on backend connections for pass fetch.
+
+-------------------------------------------------------------------
+Thu Nov 23 13:50:41 UTC 2017 - rbr...@suse.com
+
+- Replace references to /var/adm/fillup-templates with new
+ %_fillupdir macro (boo#1069468)
+
+-------------------------------------------------------------------
+Fri Jun 23 19:42:07 UTC 2017 - antoine.belv...@opensuse.org
+
+- Update to version 5.1.2:
+ * Fix an endless loop in Backend Polling (#2295)
+ * Fix a Chunked bug in tight workspaces (#2207, #2275)
+ * Fix a bug relating to req.body when on waitinglist (#2266)
+ * Handle EPIPE on broken TCP connections (#2267)
+ * Work around the x86 arch's turbo-double FP format in parameter
+ setup code. (#1875)
+ * Fix race related to backend probe with proxy header (#2278)
+ * Keep VCL temperature consistent between mgt/worker also when
+ worker protests.
+ * A lot of HTTP/2 fixes.
+- Changes introduced by version 5.1.1:
+ * Fix bug introduced by stubborn old bugger right before release
+ 5.1.0 was cut.
+- Changes introduced by version 5.1.0:
+ * Added varnishd command-line options -I, -x and -?, and
+ tightened restrictions on permitted combinations of options.
+ * More progress on support for HTTP/2.
+ * Add ``return(fail)`` to almost all VCL subroutines.
+ * Restored the old hit-for-pass, invoked with
+ ``return(pass(DURATION))`` from
+ ``vcl_backend_response``. hit-for-miss remains the default.
+ Added the cache_hitmiss stat, and cache_hitpass only counts the
+ new/old hit-for-pass cases. Restored HitPass to the Varnish
+ log, and added HitMiss. Added the HFP prefix to TTL log entries
+ to log a hit-for-pass duration.
+ * Rolled back the fix for #1206. Client delivery decides solely
+ whether to send a 304 client response, based on client request
+ and response headers.
+ * Added vtest.sh.
+ * Added vxid as a lefthand side for VSL queries.
+ * Added the setenv and write_body commands for Varnish test cases
+ (VTCs). err_shell is deprecated. Also added the operators
+ -cliexpect, -match and -hdrlen, and -reason replaces -msg.
+ Added the ${bad_backend} macro.
+ * varnishtest can be stopped with the TERM, INT and KILL signals,
+ but not with HUP.
+ * The fallback director has now an extra, optional parameter to
+ keep using the current backend until it falls sick.
+ * VMOD shared libraries are now copied to the workdir, to avoid
+ problems when VMODs are updated via packaging systems.
+ * Bump the VRT version to 6.0.
+ * Export more symbols from libvarnishapi.so.
+ * The size of the VSL log is limited to 4G-1b, placing upper
+ bounds on the -l option and the vsl_space and vsm_space
+ parameters.
+ * Added parameters clock_step, thread_pool_reserve and
+ ban_cutoff.
+ * Parameters vcl_dir and vmod_dir are deprecated, use vcl_path
+ and vmod_path instead.
+ * All parameters are defined, even on platforms that don't
+ support them. An unsupported parameter is documented as such in
+ param.show. Setting such a parameter is not an error, but has
+ no effect.
+ * Clarified the interpretations of the + and - operators in VCL
+ with operands of the various data types.
+ * DURATION types may be used in boolean contexts.
+ * INT, DURATION and REAL values can now be negative.
+ * Response codes 1000 or greater may now be set in VCL
+ internally. resp.status is delivered modulo 1000 in client
+ responses.
+ * IP addresses can be compared for equality in VCL.
+ * Introduce the STEVEDORE data type, and the objects
+ storage.SNAME in VCL. Added req.storage and beresp.storage;
+ beresp.storage_hint is deprecated.
+ * Retired the umem stevedore.
+ * req.ttl is deprecated.
+ * Added std.getenv() and std.late_100_continue().
+ * The fetch_failed stat is incremented for any kind of fetch
+ failure.
+ * Added the stats n_test_gunzip and
+ bans_lurker_obj_killed_cutoff.
+ * Clarified the meanings of the %r, %{X}i and %{X}o formatters in
+ varnishncsa.
+- Add varnish-5.1.2-add-fallthrough-comments.patch to fix build
+ with GCC 7 (boo#1041259).
+
+-------------------------------------------------------------------
+Tue May 16 20:14:01 UTC 2017 - dims...@opensuse.org
+
+- BuildRequire python3-docutils instead of python-docutils.
+
+-------------------------------------------------------------------
+Sun Sep 25 13:44:37 UTC 2016 - jeng...@inai.de
+
+- Update to new upstream release 5.0.0
+- The varnishd "-u NNN" option, which may be remaining in
+ /etc/sysconfig/varnish, has been replaced with "-j unix,user=NNN".
+* Varnish 5.0 changes some (mostly) internal APIs and adds some
+ major new features over Varnish 4.1.
+* 5.0 supports jumping from the active VCL's vcl_recv{} to another
+ VCL via a VCL label.
+* Very Experimental HTTP/2 support
+* We have added to the "directors" VMOD — an overhauled version of
+ a director which was available as an out-of-tree VMOD under the
+ name VSLP for a couple of years. It is basically a better hash
+ director which uses consistent hashing to provide improved
+ stability of backend node selection when the configuration and/or
+ health state of backends changes.
+* Hit-For-Pass is now actually Hit-For-Miss
+* We have made the ban lurker even more efficient by example of
+ some real live situations with tens of thousands of bans using
+ inefficient regular expressions.
+* The waitinglist logic for ESI subrequests now uses condition
+ variables to trigger immediate continuation of ESI processing
+ when an object being waited for becomes available.
+* Backend PROXY protocol requests are now supported through the
+ .proxy_header attribute of the backend definition.
+* VCL files are now also being searched for in
+ /usr/share/varnish/vcl if not found in /etc/varnish.
+* The basic device detection vcl is now bundled with varnish.
+
+-------------------------------------------------------------------
+Thu Aug 18 07:08:52 UTC 2016 - dims...@opensuse.org
+
+- Add "-ffloat-store -fexcess-precision=standard" to CFLAGS when
+ building for ix86, working around bug gcc#323. See also
+ gh#varnish/Varnish-Cache#88.
+
+-------------------------------------------------------------------
+Fri Apr 22 14:15:43 UTC 2016 - jeng...@inai.de
+
+- Update to new upstream release 4.1.2
+* vmods: Passing VCL ACL to a vmod is now possible.
+* vmods: VRT_MINOR_VERSION increase due to new function:
+ VRT_acl_match()
+* Be stricter when parsing a HTTP request to avoid potential HTTP
+ smuggling attacks against vulnerable backends.
+
+-------------------------------------------------------------------
+Tue Mar 8 08:47:30 UTC 2016 - jeng...@inai.de
+
+- Report testsuite failure to build log and make testsuite nonfatal
+ as there seems to be one swaying test, tests/r01478.vtc.
+
+-------------------------------------------------------------------
+Tue Feb 16 12:52:51 UTC 2016 - eshmar...@suse.com
+
+- disable silent rules in spec file.
+- enable testsuite for varnish.
+
+-------------------------------------------------------------------
+Tue Feb 16 12:16:47 UTC 2016 - eshmar...@suse.com
+
++++ 227 more lines (skipped)
++++ between /dev/null
++++ and
/work/SRC/openSUSE:Leap:15.1:Update/.varnish.12875.new.3606/varnish.changes
New:
----
0001-Clear-err_code-and-err_reason-at-start-of-request-ha.patch
0001-Handle-badly-formatted-proxy-TLVs.patch
uninit.patch
varnish-5.1.2-add-fallthrough-comments.patch
varnish-6.2.1.tgz
varnish.changes
varnish.logrotate
varnish.service
varnish.spec
varnish.sysconfig
varnishlog.service
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ varnish.spec ++++++
#
# spec file for package varnish
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if !0%{?_fillupdir:1}
%define _fillupdir /var/adm/fillup-templates
%endif
%define library_name libvarnishapi2
%define pkg_home %_localstatedir/lib/%name
%define pkg_logdir %_localstatedir/log/%name
%define pkg_cachedir %_localstatedir/cache/%name
Name: varnish
Version: 6.2.1
Release: 0
Summary: Accelerator for HTTP services
License: BSD-2-Clause
Group: Productivity/Networking/Web/Proxy
URL: http://varnish-cache.org/
#Git-Clone: git://git.varnish-cache.org/varnish-cache
#Git-Web: https://varnish-cache.org/trac/browser
Source: https://varnish-cache.org/_downloads/%name-%version.tgz
Source3: varnish.sysconfig
Source5: varnish.logrotate
Source7: varnish.service
Source8: varnishlog.service
Patch1: varnish-5.1.2-add-fallthrough-comments.patch
Patch2: uninit.patch
Patch3: 0001-Clear-err_code-and-err_reason-at-start-of-request-ha.patch
Patch4: 0001-Handle-badly-formatted-proxy-TLVs.patch
BuildRequires: python3-docutils
BuildRequires: python3-Sphinx
BuildRequires: libxslt
BuildRequires: ncurses-devel
BuildRequires: pcre-devel
BuildRequires: pkgconfig
BuildRequires: readline-devel
BuildRequires: systemd-rpm-macros
BuildRequires: xz
Requires: c_compiler
Requires(pre): %_sbindir/useradd %_sbindir/groupadd
Recommends: logrotate
%description
Varnish is an HTTP accelerator. Often called Reverse Proxy, it is an
application that stores (caches) documents that have been requested
over the HTTP protocol.
Based on certain criteria, the next client requesting the document is either
given the cached document, or a "fresh" document requested from a backend
server. The purpose of this is to minimize the requests going to the backend
server(s) by serving the same document to potentially many users.
%package -n %library_name
Summary: Shared libraries for Varnish
Group: Productivity/Networking/Web/Proxy
%description -n %library_name
Varnish is an HTTP accelerator. Often called Reverse Proxy, it is an
application that stores (caches) documents that have been requested
over the HTTP protocol.
Based on certain criteria, the next client requesting the document is either
given the cached document, or a "fresh" document requested from a backend
server. The purpose of this is to minimize the requests going to the backend
server(s) by serving the same document to potentially many users.
This package holds the shared libraries for varnish.
%package devel
Summary: Development files for Varnish
Group: Development/Libraries/C and C++
Requires: %name = %version
%description devel
Varnish is an HTTP accelerator. Often called Reverse Proxy, it is an
application that stores (caches) documents that have been requested
over the HTTP protocol.
This package holds the development files for varnish.
%prep
%autosetup -p1
%build
export CFLAGS="%optflags -fstack-protector -Wno-error=clobbered
-Werror=maybe-uninitialized"
%ifarch %ix86
export CFLAGS="$CFLAGS -ffloat-store -fexcess-precision=standard"
%endif
%configure --disable-static --docdir="%_docdir/%name" \
--localstatedir="%_localstatedir/cache/" \
--disable-silent-rules \
--enable-developer-warnings
make %{?_smp_mflags}
%install
b="%buildroot"
%make_install
# There is no use for them to normal users
mv "$b/%_bindir"/* "$b/%_sbindir/"
#
##missing directories
install -dm 0755 "$b"/{%pkg_logdir,%pkg_home}
install -Dpm 0644 "%{S:5}" "$b/%_sysconfdir/logrotate.d/varnish"
#
##init scripts
install -Dpm 0644 "%{S:3}" "$b/%_fillupdir/sysconfig.%name"
install -Dpm 0644 "%{S:7}" "$b/%_unitdir/varnish.service"
install -Dpm 0644 "%{S:8}" "$b/%_unitdir/varnishlog.service"
mkdir -p "$b/%_sbindir"
ln -s service "$b/%_sbindir/rcvarnish"
ln -s service "$b/%_sbindir/rcvarnishlog"
#
##config files
mkdir -p "$b/%_sysconfdir/%name"
cp "$b/%_docdir/%name/example.vcl" "$b/%_sysconfdir/%name/vcl.conf"
find "$b" -type f -name "*.la" -delete -print
mkdir -p "$b/%pkg_logdir"
mkdir -p "$b/%_docdir/%name"
cp -a ChangeLog LICENSE README.rst "$b/%_docdir/%name/"
perl -i -pe 's{^#!/usr/bin/env python}{#!/usr/bin/python}g' \
"$b/usr/share/varnish/vmodtool.py" "$b/usr/share/varnish/vsctool.py"
%check
if ! make %{?_smp_mflags} check; then
x="$?"
cat bin/varnishtest/test-suite.log
exit "$x"
fi
%pre
%_bindir/getent group varnish >/dev/null || \
%_sbindir/groupadd -r varnish
%_bindir/getent passwd varnish >/dev/null || \
%_sbindir/useradd -g varnish -s /bin/false -r -c "user for Varnish" \
-d %pkg_home varnish
%service_add_pre varnish.service varnishlog.service
%post
%fillup_only
%service_add_post varnish.service varnishlog.service
%preun
%service_del_preun varnish.service varnishlog.service
%postun
%service_del_postun varnish.service varnishlog.service
%post -n %library_name -p /sbin/ldconfig
%postun -n %library_name -p /sbin/ldconfig
%files
%_unitdir/*.service
%config(noreplace) %_sysconfdir/logrotate.d/varnish
%dir %attr(0750,root,varnish) %_sysconfdir/%name/
%config(noreplace) %attr(0640,root,varnish) %_sysconfdir/%name/vcl.conf
%_libdir/varnish
%_sbindir/varnish*
%_sbindir/rcvarnish*
%_mandir/man*/*
%_docdir/%name/
%_datadir/%name/
%dir %attr(0750,varnish,varnish) %pkg_home
%dir %attr(0750,varnish,varnish) %pkg_cachedir
%dir %attr(0750,varnish,varnish) %pkg_logdir
%_fillupdir/sysconfig.%name
%files -n %library_name
%_libdir/libvarnishapi.so.2*
%files devel
%_includedir/varnish/
%_datadir/aclocal/
%_libdir/pkgconfig/*
%_libdir/libvarnishapi.so
%changelog
++++++ 0001-Clear-err_code-and-err_reason-at-start-of-request-ha.patch ++++++
>From 99da6e40df70824bb72854be96ea649659cd1920 Mon Sep 17 00:00:00 2001
From: Martin Blix Grydeland <mar...@varnish-software.com>
Date: Tue, 1 Oct 2019 11:17:17 +0200
Subject: [PATCH] Clear err_code and err_reason at start of request handling
req->err_code and req->err_reason are set when going to synthetic
handling. From there the resp.reason HTTP field is set from
req->err_reason if set, or the generic code based on req->err_code is used
if it was NULL. This patch clears these members so that a value from the
handling of a previous request doesn't linger.
Fixes: VSV00004
---
bin/varnishd/cache/cache_req_fsm.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/bin/varnishd/cache/cache_req_fsm.c
b/bin/varnishd/cache/cache_req_fsm.c
index a8ee9c61b..c6f4e7f3e 100644
--- a/bin/varnishd/cache/cache_req_fsm.c
+++ b/bin/varnishd/cache/cache_req_fsm.c
@@ -807,6 +807,8 @@ cnt_recv_prep(struct req *req, const char *ci)
req->is_hit = 0;
req->is_hitmiss = 0;
req->is_hitpass = 0;
+ req->err_code = 0;
+ req->err_reason = NULL;
}
/*--------------------------------------------------------------------
--
2.26.2
++++++ 0001-Handle-badly-formatted-proxy-TLVs.patch ++++++
>From d28b56d2638c7e12bd16fba4e2ccd00789bb84c8 Mon Sep 17 00:00:00 2001
From: Martin Blix Grydeland <mar...@varnish-software.com>
Date: Thu, 12 Dec 2019 14:53:48 +0100
Subject: [PATCH] Handle badly formatted proxy TLVs
Proxy TLVs claiming to have PP2_TYPE_SSL sub-TLVs without complete payload
would cause a Varnish assert. This patch fixes the parsing of the TLVs.
---
bin/varnishd/proxy/cache_proxy_proto.c | 9 +++++++--
diff --git a/bin/varnishd/proxy/cache_proxy_proto.c
b/bin/varnishd/proxy/cache_proxy_proto.c
index c6255b6e6..15b243491 100644
--- a/bin/varnishd/proxy/cache_proxy_proto.c
+++ b/bin/varnishd/proxy/cache_proxy_proto.c
@@ -276,8 +276,9 @@ vpx_tlv_itern(struct vpx_tlv_iter *vpi)
return (1);
}
-#define VPX_TLV_FOREACH(ptr, len, itv) \
- for(vpx_tlv_iter0(itv, ptr, len); vpx_tlv_itern(itv);)
+#define VPX_TLV_FOREACH(ptr, len, itv) \
+ for (vpx_tlv_iter0(itv, ptr, len); \
+ (vpi->e == NULL) && vpx_tlv_itern(itv);)
int
VPX_tlv(const struct req *req, int typ, void **dst, int *len)
@@ -453,6 +454,10 @@ vpx_proto2(const struct worker *wrk, struct req *req)
VPX_TLV_FOREACH(d, l, vpi) {
if (vpi->t == PP2_TYPE_SSL) {
+ if (vpi->l < 5) {
+ vpi->e = "Length Error";
+ break;
+ }
VPX_TLV_FOREACH((char*)vpi->p + 5, vpi->l - 5, vpi2) {
}
vpi->e = vpi2->e;
--
2.26.2
++++++ uninit.patch ++++++
From: Jan Engelhardt <jeng...@inai.de>
Date: 2019-08-26 14:13:15.685236019 +0200
varnish screwing itself by use of -Werror.
[ 34s] vtc_haproxy.c: In function 'haproxy_start':
[ 34s] vtc_haproxy.c:442:10: error: 'pid' may be used uninitialized in this
function [-Werror=maybe-uninitialized]
[ 34s] 442 | h->pid = pid;
[ 34s] | ^
[ 34s] vtc_haproxy.c:413:8: note: 'pid' was declared here
[ 34s] 413 | pid_t pid;
---
bin/varnishtest/vtc_haproxy.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: varnish-6.2.0/bin/varnishtest/vtc_haproxy.c
===================================================================
--- varnish-6.2.0.orig/bin/varnishtest/vtc_haproxy.c
+++ varnish-6.2.0/bin/varnishtest/vtc_haproxy.c
@@ -410,7 +410,7 @@ haproxy_wait_pidfile(struct haproxy *h)
char buf_err[1024] = {0};
int usleep_time = 1000;
double t0;
- pid_t pid;
+ pid_t pid = 0;
vtc_log(h->vl, 3, "wait-pid-file");
for (t0 = VTIM_mono(); VTIM_mono() - t0 < 3;) {
++++++ varnish-5.1.2-add-fallthrough-comments.patch ++++++
From: antoine.belv...@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;
++++++ varnish.logrotate ++++++
/var/log/varnish/*.log {
su varnish varnish
missingok
notifempty
sharedscripts
delaycompress
postrotate
/etc/init.d/varnish reload
endscript
}
++++++ varnish.service ++++++
[Unit]
Description=Varnish HTTP accelerator/reverse proxy
After=network.target
[Service]
EnvironmentFile=/etc/sysconfig/varnish
PIDFile=/var/run/varnishd.pid
ExecStart=/usr/sbin/varnishd -P /var/run/varnishd.pid -F $VARNISHD_PARAMS
[Install]
WantedBy=multi-user.target
++++++ varnish.sysconfig ++++++
## Path: Network/WWW/Varnishd
## Description: start parameters for varnishd.
## Type: string
## Default: "-f /etc/varnish/vcl.conf -T127.0.0.1:6082 -s
file,/var/cache/varnish"
## Config: varnishd
#
# start parameters for varnishd.
#
# see man 1 varnishd for more
#
# You might want to keep "/var/cache/varnish" when using the file backend.
#
VARNISHD_PARAMS="-j unix,user=varnish -f /etc/varnish/vcl.conf -T:6082 -s
file,/var/cache/varnish,1M"
## Path: Network/WWW/Varnishd
## Description: Start parameters for varnishlog
## Type: string
## Default: "-a -w /var/log/varnish.log"
## Config: varnishd
#
# start parameters for varnishlog/varnishncsa
#
# see man 1 varnishlog for more
#
VARNISHLOG_PARAMS="-a -w /var/log/varnish/varnish.log"
++++++ varnishlog.service ++++++
[Unit]
Description=Varnish log generator
Requires=varnish.service
#After= is not required
[Service]
EnvironmentFile=/etc/sysconfig/varnish
PIDFile=/var/run/varnishlog.pid
ExecStart=/usr/sbin/varnishncsa -P /var/run/varnishlog.pid $VARNISHLOG_PARAMS
[Install]
WantedBy=multi-user.target
