commit 1021e72b549dec72d96c9198f12cdcd21cc23e3a
author Christopher Faulet <cfaulet@haproxy.com> Tue Sep 03 21:55:14 2019 +0200
committer Christopher Faulet <cfaulet@haproxy.com> Wed Sep 04 10:36:55 2019 +0200
tree fd02dcfce0ad7597d960de312a1f4e29732dd028
parent 98e2bc255031791ada2a647950a4298a3683598d

BUG/MINOR: mux-h1: Be sure to update the count before adding EOM after trailers

Otherwise, an EOM may be added in a full buffer.

This patch must be backported to 2.0.

(cherry picked from commit f1ef7f641d8bc8de71394a84a46b70f74f30f565)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>

src/mux_h1.c

diff --git a/src/mux_h1.c b/src/mux_h1.c
index 83dd123..de63a05 100644
--- a/src/mux_h1.c
+++ b/src/mux_h1.c
@@ -1434,7 +1434,7 @@
 				if (!ret)
 					break;
 			}
-			if (!h1_process_eom(h1s, h1m, htx, count))
+			else if (!h1_process_eom(h1s, h1m, htx, count))
 				break;
 		}
 		else if (h1m->state == H1_MSG_DONE) {