h2: Move the frame completion check up

Avoid failing sessions with pipelined data.

h2: Move the frame completion check up
Avoid failing sessions with pipelined data.
f12d4c02 · Dag Haavi Finstad · Dridi Boukelmoune · ab6cf6cf · f12d4c02
Commit f12d4c02 authored May 28, 2018 by Dag Haavi Finstad Committed by Dridi Boukelmoune Jun 20, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

cache_http2_proto.c bin/varnishd/http2/cache_http2_proto.c +5 -4

No files found.
--- a/bin/varnishd/http2/cache_http2_proto.c
+++ b/bin/varnishd/http2/cache_http2_proto.c
@@ -830,11 +830,12 @@ h2_frame_complete(struct http_conn *htc)
 	if (l < 9)
 		return (HTC_S_MORE);
 	u = vbe32dec(htc->rxbuf_b) >> 8;
-	if (l > h2->local_settings.max_frame_size + 9)
+	if (l >= u + 9)
+		return (HTC_S_COMPLETE);
+	else if (l > h2->local_settings.max_frame_size + 9)
 		return (HTC_S_OVERFLOW);
-	if (l < u + 9)	// XXX: Only for !DATA frames
-		return (HTC_S_MORE);
-	return (HTC_S_COMPLETE);
+
+	return (HTC_S_MORE);
 }

 /**********************************************************************/