daghf

diff --git a/configure.ac b/configure.ac
index 7cbbe53be..1f9a2f8b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -261,6 +261,11 @@ if test "$ac_cv_have_viz" = no; then
 fi
 CFLAGS="${save_CFLAGS}"
 
+if test "x$GCC" = "xyes"; then
+       libvgz_extra_cflags="${libvgz_extra_cflags} -Wno-unknown-warning-option -Wno-implicit-fallthrough"

daghf

diff --git a/lib/libvgz/Makefile.am b/lib/libvgz/Makefile.am
index db9a48bdc..796655c6f 100644
--- a/lib/libvgz/Makefile.am
+++ b/lib/libvgz/Makefile.am
@@ -5,6 +5,7 @@ AM_LDFLAGS  = $(AM_LT_LDFLAGS)
 noinst_LIBRARIES = libvgz.a
 
 libvgz_a_CFLAGS = -D_LARGEFILE64_SOURCE=1 -DZLIB_CONST \
+       -Wno-unknown-warning-option -Wno-implicit-fallthrough \
        $(libvgz_extra_cflags) @SAN_CFLAGS@

daghf

diff --git a/bin/varnishd/http2/cache_http2_proto.c b/bin/varnishd/http2/cache_http2_proto.c
index 8b6102066..e1f02eb9e 100644
--- a/bin/varnishd/http2/cache_http2_proto.c
+++ b/bin/varnishd/http2/cache_http2_proto.c
@@ -165,8 +165,6 @@ h2_del_req(struct worker *wrk, const struct h2_req *r2)
 {
        struct h2_sess *h2;
        struct sess *sp;
-       struct req *req;
-       int r;

daghf

diff --git a/bin/varnishd/cache/cache_backend_tcp.c b/bin/varnishd/cache/cache_backend_tcp.c
index 8ad54e3..4810dfe 100644
--- a/bin/varnishd/cache/cache_backend_tcp.c
+++ b/bin/varnishd/cache/cache_backend_tcp.c
@@ -382,7 +382,8 @@ VBT_Get(struct tcp_pool *tp, double tmo, const struct backend *be,
                Lck_Lock(&tp->mtx);
                tp->n_used--;           // Nope, didn't work after all.
                Lck_Unlock(&tp->mtx);
-       }
+       } else

daghf

varnishtest "verify that grace works for hit_for_pass objects"

server s1 {
	rxreq
	expect req.http.a == "1"
	txresp

	rxreq
	expect req.http.b == "1"
	sema r2 sync 2

daghf

diff --git a/bin/varnishtest/tests/b00039.vtc b/bin/varnishtest/tests/b00039.vtc
index cf1e9dc..48f13c5 100644
--- a/bin/varnishtest/tests/b00039.vtc
+++ b/bin/varnishtest/tests/b00039.vtc
@@ -5,7 +5,7 @@ server s1 {
        txresp -hdr "Last-Modified: Wed, 11 Sep 2013 13:36:55 GMT" -body "Geoff Rules"
        rxreq
        expect req.http.if-modified-since == "Wed, 11 Sep 2013 13:36:55 GMT"
-       txresp -status 304
+       txresp -status 304 -hdr "Malformed"

daghf

commit 854570ac5d2e63778cfef760d490b42decc38894
Author: Dag Haavi Finstad <daghf@varnish-software.com>
Date:   Mon Jun 1 14:13:35 2015 +0200

    Disable TLS session cache and tickets.

diff --git a/src/ssl.c b/src/ssl.c
index 604bf0b..a0f79e4 100644
--- a/src/ssl.c
+++ b/src/ssl.c

daghf

#include <stdio.h>
#include <string.h>
#include <arpa/inet.h>
#include <assert.h>

#define PROXY2_SIG	"\x0D\x0A\x0D\x0A\x00\x0D\x0A\x51\x55\x49\x54\x0A"

uint16_t
port(const char *portspec)
{

daghf

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index fd8291f..df5997d 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -620,6 +620,8 @@ struct req {
        ssize_t                 l_crc;
        uint32_t                crc;
 
+       struct http             *top;
+

daghf

diff --git a/bin/varnishd/cache_backend.c b/bin/varnishd/cache_backend.c
index c4b9a16..c48f2d4 100644
--- a/bin/varnishd/cache_backend.c
+++ b/bin/varnishd/cache_backend.c
@@ -278,9 +278,6 @@ vbe_Healthy(const struct vdi_simple *vs, const struct sess *sp)
        if (threshold == 0 || VTAILQ_EMPTY(&backend->troublelist))
                return (1);
 
-       if (sp->objcore == NULL)
-               return (1);