From: Christopher Faulet <cfaulet@haproxy.com>
Date: Fri, 24 May 2019 19:43:55 +0000 (+0200)
Subject: MINOR: mux-h1: Don't count the EOM in the estimated size of headers
X-Git-Tag: v2.0-dev6~35
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4c7ce017fc5ec2e95f84832d8a64242924441f91;p=thirdparty%2Fhaproxy.git

MINOR: mux-h1: Don't count the EOM in the estimated size of headers

If there is not enough space in the HTX message, the EOM can be delayed when a
bodyless message is added. So, don't count it in the estimated size of headers.
---

diff --git a/src/mux_h1.c b/src/mux_h1.c
index e89dfd3e22..c5fdb7df12 100644
--- a/src/mux_h1.c
+++ b/src/mux_h1.c
@@ -920,11 +920,6 @@ static size_t h1_eval_htx_req_size(struct h1m *h1m, union h1_sl *h1sl, struct ht
 	/* size of the HTX start-line */
 	sz = sizeof(struct htx_sl) + h1sl->rq.m.len + h1sl->rq.u.len + h1sl->rq.v.len;
 	sz += h1_eval_htx_hdrs_size(hdrs);
-
-	/* size of the EOM */
-	if (h1m->state == H1_MSG_DONE)
-		sz += sizeof(struct htx_blk) + 1;
-
 	return sz;
 }
 
@@ -936,11 +931,6 @@ static size_t h1_eval_htx_res_size(struct h1m *h1m, union h1_sl *h1sl, struct ht
 	/* size of the HTX start-line */
 	sz = sizeof(struct htx_sl) + h1sl->st.v.len + h1sl->st.c.len + h1sl->st.r.len;
 	sz += h1_eval_htx_hdrs_size(hdrs);
-
-	/* size of the EOM */
-	if (h1m->state == H1_MSG_DONE)
-		sz += sizeof(struct htx_blk) + 1;
-
 	return sz;
 }