[master] 4d8e4b9cb Fix max_concurrent_streams check

Dridi Boukelmoune dridi.boukelmoune at gmail.com
Thu Feb 21 13:44:07 UTC 2019


commit 4d8e4b9cb960039d08814034d65d3ece1e78d042
Author: Shohei Tanaka(@xcir) <kokoniimasu+git at gmail.com>
Date:   Thu Feb 21 21:01:17 2019 +0900

    Fix max_concurrent_streams check

diff --git a/bin/varnishd/http2/cache_http2_proto.c b/bin/varnishd/http2/cache_http2_proto.c
index 5b6ce30c0..bb2de4cf4 100644
--- a/bin/varnishd/http2/cache_http2_proto.c
+++ b/bin/varnishd/http2/cache_http2_proto.c
@@ -634,7 +634,7 @@ h2_rx_headers(struct worker *wrk, struct h2_sess *h2, struct h2_req *r2)
 	if (r2 == NULL) {
 		if (h2->rxf_stream <= h2->highest_stream)
 			return (H2CE_PROTOCOL_ERROR);	// rfc7540,l,1153,1158
-		if (h2->refcnt >= h2->local_settings.max_concurrent_streams) {
+		if (h2->refcnt > h2->local_settings.max_concurrent_streams) {
 			VSLb(h2->vsl, SLT_Debug,
 			     "H2: stream %u: Hit maximum number of "
 			     "concurrent streams", h2->rxf_stream);
diff --git a/bin/varnishtest/tests/t02012.vtc b/bin/varnishtest/tests/t02012.vtc
index 5319453e7..3f7ec8092 100644
--- a/bin/varnishtest/tests/t02012.vtc
+++ b/bin/varnishtest/tests/t02012.vtc
@@ -12,7 +12,7 @@ server s1 {
 
 varnish v1 -cliok "param.set feature +http2"
 varnish v1 -cliok "param.set debug +syncvsl"
-varnish v1 -cliok "param.set h2_max_concurrent_streams 3"
+varnish v1 -cliok "param.set h2_max_concurrent_streams 2"
 
 varnish v1 -vcl+backend {
 	import vtc;


More information about the varnish-commit mailing list