[master] 3db481a A *little* bit more coverage

[Poul-Henning Kamp]

commit 3db481a96f55ecff21983c09c644f578ac507b1f
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Mar 30 07:23:20 2017 +0000

    A *little* bit more coverage

diff --git a/bin/varnishd/http2/cache_http2_proto.c b/bin/varnishd/http2/cache_http2_proto.c
index 5e34543..4441406 100644
--- a/bin/varnishd/http2/cache_http2_proto.c
+++ b/bin/varnishd/http2/cache_http2_proto.c
@@ -767,10 +767,10 @@ h2_procframe(struct worker *wrk, struct h2_sess *h2,
 	}
 
 	VTAILQ_FOREACH_SAFE(r2, &h2->streams, list, r22) {
-		if (r2->stream == h2->rxf_stream)
-			break;
 		if (r2->state == H2_S_CLOSED && !r2->scheduled)
 			h2_del_req(wrk, r2);
+		else if (r2->stream == h2->rxf_stream)
+			break;
 	}
 
 	if (r2 == NULL && h2f->act_sidle == 0) {
diff --git a/bin/varnishtest/tests/t02003.vtc b/bin/varnishtest/tests/t02003.vtc
index eef69e2..db5fb31 100644
--- a/bin/varnishtest/tests/t02003.vtc
+++ b/bin/varnishtest/tests/t02003.vtc
@@ -228,6 +228,18 @@ client c1 {
 	} -run
 } -run
 
+client c1 {
+	stream 1 {
+		txreq
+		rxresp
+	} -run
+	stream 1 {
+		# RST_STREAM on closed stream
+		txrst
+	} -run
+} -run
+
+
 varnish v1 -vsl_catchup
 
 varnish v1 -expect MEMPOOL.req0.live == 0