Commit ee3abf8e authored by Dag Haavi Finstad's avatar Dag Haavi Finstad

New take on #2624 after Martin's RxStuff overflow fixes

parent ed5c43be
...@@ -882,8 +882,6 @@ h2_frame_complete(struct http_conn *htc) ...@@ -882,8 +882,6 @@ h2_frame_complete(struct http_conn *htc)
u = vbe32dec(htc->rxbuf_b) >> 8; u = vbe32dec(htc->rxbuf_b) >> 8;
if (l >= u + 9) if (l >= u + 9)
return (HTC_S_COMPLETE); return (HTC_S_COMPLETE);
else if (l > h2->local_settings.max_frame_size + 9)
return (HTC_S_OVERFLOW);
return (HTC_S_MORE); return (HTC_S_MORE);
} }
...@@ -1068,7 +1066,7 @@ h2_rxframe(struct worker *wrk, struct h2_sess *h2) ...@@ -1068,7 +1066,7 @@ h2_rxframe(struct worker *wrk, struct h2_sess *h2)
hs = HTC_RxStuff(h2->htc, h2_frame_complete, hs = HTC_RxStuff(h2->htc, h2_frame_complete,
NULL, NULL, NAN, NULL, NULL, NAN,
h2->sess->t_idle + cache_param->timeout_idle, h2->sess->t_idle + cache_param->timeout_idle,
16384 + 9); // rfc7540,l,4228,4228 h2->local_settings.max_frame_size + 9);
switch (hs) { switch (hs) {
case HTC_S_COMPLETE: case HTC_S_COMPLETE:
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment