commit f6cce3f0ef9b416e6bdab7741812aa44accf9d3e
author Christopher Faulet <cfaulet@haproxy.com> Wed Feb 27 21:20:09 2019 +0100
committer Willy Tarreau <w@1wt.eu> Fri Mar 15 14:33:50 2019 +0100
tree 95f8ae0f06d062cf004415b45c8e863fb6a1016b
parent 1e2d63641367fb66b3af5f6ef7d3cd7b295a7cc7

BUG/MINOR: lua/htx: Use channel_add_input() when response data are added

This patch must be backported to 1.9.

src/hlua.c

diff --git a/src/hlua.c b/src/hlua.c
index 3d09d27..dd5a2c2 100644
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -4213,8 +4213,7 @@
 		goto fail;
 
 	data = htx->data - co_data(res);
-	res->total += data;
-	res->flags |= CF_READ_PARTIAL;
+	channel_add_input(res, data);
 	appctx->appctx->ctx.hlua_apphttp.flags &= ~APPLET_100C;
 	return;
 
@@ -4635,9 +4634,8 @@
 	/* Copy data. */
 	if (!htx_add_data(htx, ist2(data + l, max)))
 		goto snd_yield;
-	res->total += max;
-	res->flags |= CF_READ_PARTIAL;
 	htx_to_buf(htx, &res->buf);
+	channel_add_input(res, max);
 
 	/* update counters. */
 	l += max;
@@ -4988,8 +4986,7 @@
 	}
 
 	htx_to_buf(htx, &res->buf);
-	res->total += htx->data;
-	res->flags |= CF_READ_PARTIAL;
+	channel_add_input(res, htx->data);
 
 	/* Headers sent, set the flag. */
 	appctx->appctx->ctx.hlua_apphttp.flags |= APPLET_HDR_SENT;
@@ -7392,8 +7389,7 @@
 			si_rx_room_blk(si);
 			goto out;
 		}
-                res->total++;
-		res->flags |= CF_READ_PARTIAL;
+		channel_add_input(res, 1);
 	}
 
   done:
@@ -7444,9 +7440,7 @@
 		res->buf.data = b_data(err);
                 memcpy(res->buf.area, b_head(err), b_data(err));
                 res_htx = htx_from_buf(&res->buf);
-
-                res->total += res_htx->data;
-		res->flags |= CF_READ_PARTIAL;
+		channel_add_input(res, res_htx->data);
 	}
 	if (!(strm->flags & SF_ERR_MASK))
 		strm->flags |= SF_ERR_RESOURCE;