[5.1] 569dc01 Add a couple of commits to try to catch #2257

[Poul-Henning Kamp]

commit 569dc01257c7c5744ffc4e10b09156f4c3ea3912
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Mar 22 11:38:52 2017 +0000

    Add a couple of commits to try to catch #2257

diff --git a/bin/varnishd/cache/cache_req_fsm.c b/bin/varnishd/cache/cache_req_fsm.c
index ee135e7..524a21e 100644
--- a/bin/varnishd/cache/cache_req_fsm.c
+++ b/bin/varnishd/cache/cache_req_fsm.c
@@ -1011,6 +1011,7 @@ CNT_Request(struct worker *wrk, struct req *req)
 		VRB_Free(req);
 		req->wrk = NULL;
 	}
+	assert(nxt == REQ_FSM_DISEMBARK || req->ws->r == NULL);
 	return (nxt);
 }
 
diff --git a/bin/varnishd/http2/cache_http2_proto.c b/bin/varnishd/http2/cache_http2_proto.c
index 60b671c..33aea63 100644
--- a/bin/varnishd/http2/cache_http2_proto.c
+++ b/bin/varnishd/http2/cache_http2_proto.c
@@ -440,6 +440,7 @@ h2_do_req(struct worker *wrk, void *priv)
 	req->http->conds = 1;
 	if (CNT_Request(wrk, req) != REQ_FSM_DISEMBARK) {
 		VSL(SLT_Debug, 0, "H2REQ CNT done");
+		AZ(req->ws->r);
 		r2->state = H2_S_CLOSED;
 		h2_del_req(wrk, r2);
 	}