[6.0] 264d0d934 New take on #2624 after Martin's RxStuff overflow fixes
Dridi Boukelmoune
dridi.boukelmoune at gmail.com
Thu Aug 16 08:53:12 UTC 2018
commit 264d0d934241ce33837ac6c7c76ecb2107b830f9
Author: Dag Haavi Finstad <daghf at varnish-software.com>
Date: Tue Jun 12 11:28:59 2018 +0200
New take on #2624 after Martin's RxStuff overflow fixes
diff --git a/bin/varnishd/http2/cache_http2_proto.c b/bin/varnishd/http2/cache_http2_proto.c
index 64d55a6f9..c43a65f96 100644
--- a/bin/varnishd/http2/cache_http2_proto.c
+++ b/bin/varnishd/http2/cache_http2_proto.c
@@ -882,8 +882,6 @@ h2_frame_complete(struct http_conn *htc)
u = vbe32dec(htc->rxbuf_b) >> 8;
if (l >= u + 9)
return (HTC_S_COMPLETE);
- else if (l > h2->local_settings.max_frame_size + 9)
- return (HTC_S_OVERFLOW);
return (HTC_S_MORE);
}
@@ -1068,7 +1066,7 @@ h2_rxframe(struct worker *wrk, struct h2_sess *h2)
hs = HTC_RxStuff(h2->htc, h2_frame_complete,
NULL, NULL, NAN,
h2->sess->t_idle + cache_param->timeout_idle,
- 16384 + 9); // rfc7540,l,4228,4228
+ h2->local_settings.max_frame_size + 9);
switch (hs) {
case HTC_S_COMPLETE:
break;
More information about the varnish-commit
mailing list