From: Christopher Faulet <cfaulet@haproxy.com>
Date: Tue, 3 Sep 2019 14:16:50 +0000 (+0200)
Subject: BUG/MINOR: mux-h1: Fix size evaluation of HTX messages after headers parsing
X-Git-Tag: v2.1-dev2~118
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8427d0d6f8b17615be4cb2a80a8af794ae9c55d2;p=thirdparty%2Fhaproxy.git

BUG/MINOR: mux-h1: Fix size evaluation of HTX messages after headers parsing

The block size of the start-line was not counted.

This patch must be backported to 2.0.
---

diff --git a/src/mux_h1.c b/src/mux_h1.c
index adfcc0add1..24bd93be31 100644
--- a/src/mux_h1.c
+++ b/src/mux_h1.c
@@ -973,7 +973,7 @@ static size_t h1_eval_htx_req_size(struct h1m *h1m, union h1_sl *h1sl, struct ht
 	size_t sz;
 
 	/* size of the HTX start-line */
-	sz = sizeof(struct htx_sl) + h1sl->rq.m.len + h1sl->rq.u.len + h1sl->rq.v.len;
+	sz = sizeof(struct htx_blk) + sizeof(struct htx_sl) + h1sl->rq.m.len + h1sl->rq.u.len + h1sl->rq.v.len;
 	sz += h1_eval_htx_hdrs_size(hdrs);
 	return sz;
 }
@@ -984,7 +984,7 @@ static size_t h1_eval_htx_res_size(struct h1m *h1m, union h1_sl *h1sl, struct ht
 	size_t sz;
 
 	/* size of the HTX start-line */
-	sz = sizeof(struct htx_sl) + h1sl->st.v.len + h1sl->st.c.len + h1sl->st.r.len;
+	sz = sizeof(struct htx_blk) + sizeof(struct htx_sl) + h1sl->st.v.len + h1sl->st.c.len + h1sl->st.r.len;
 	sz += h1_eval_htx_hdrs_size(hdrs);
 	return sz;
 }