[master] 86d58ee31 Revert "Decline DATA frames after seeing END_STREAM"
Dag Haavi Finstad
daghf at varnish-software.com
Fri Jun 22 09:44:14 UTC 2018
commit 86d58ee31fe1ebaab2442f840b8b03becda0ceff
Author: Dag Haavi Finstad <daghf at varnish-software.com>
Date: Thu Jun 21 15:09:34 2018 +0200
Revert "Decline DATA frames after seeing END_STREAM"
This approach opens up to a data race.
This reverts commit c8bfae704dcb25002daaf5206d5b4c1a9b7cf753.
diff --git a/bin/varnishd/http2/cache_http2_proto.c b/bin/varnishd/http2/cache_http2_proto.c
index d10f00df2..7001b60fc 100644
--- a/bin/varnishd/http2/cache_http2_proto.c
+++ b/bin/varnishd/http2/cache_http2_proto.c
@@ -726,12 +726,6 @@ h2_rx_data(struct worker *wrk, struct h2_sess *h2, struct h2_req *r2)
ASSERT_RXTHR(h2);
if (r2 == NULL || !r2->scheduled)
return (0);
- if (r2->req->req_body_status == REQ_BODY_NONE) {
- /* state REQ_BODY_NONE implies we already received an
- * END_STREAM. */
- r2->error = H2SE_STREAM_CLOSED;
- return (H2SE_STREAM_CLOSED); // rfc7540,l,1766,1769
- }
Lck_Lock(&h2->sess->mtx);
AZ(h2->mailcall);
h2->mailcall = r2;
diff --git a/bin/varnishtest/tests/t02014.vtc b/bin/varnishtest/tests/t02014.vtc
index db72566db..bc49f4e84 100644
--- a/bin/varnishtest/tests/t02014.vtc
+++ b/bin/varnishtest/tests/t02014.vtc
@@ -1,6 +1,6 @@
varnishtest "Exercise h/2 sender flow control code"
-barrier b1 sock 3 -cyclic
+barrier b1 sock 3
server s1 {
rxreq
@@ -45,19 +45,3 @@ client c1 {
stream 0 -wait
} -run
-
-client c1 {
- stream 0 {
- barrier b1 sync
- } -start
-
- stream 1 {
- txreq
- txdata -data "fail"
- rxrst
- expect rst.err == STREAM_CLOSED
- barrier b1 sync
- } -run
-
- stream 0 -wait
-} -run
More information about the varnish-commit
mailing list