mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-21 13:51:26 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
This patch must be backported to 1.9.
This commit is contained in:
Christopher Faulet 2019-02-27 21:20:09 +01:00 committed by Willy Tarreau
parent 1e2d636413
commit f6cce3f0ef
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/hlua.c
View File

@ -4213,8 +4213,7 @@ __LJMP static void hlua_applet_htx_reply_100_continue(lua_State *L)
goto fail; goto fail;
data = htx->data - co_data(res); data = htx->data - co_data(res);
res->total += data; channel_add_input(res, data);
res->flags |= CF_READ_PARTIAL;
appctx->appctx->ctx.hlua_apphttp.flags &= ~APPLET_100C; appctx->appctx->ctx.hlua_apphttp.flags &= ~APPLET_100C;
return; return;
@ -4635,9 +4634,8 @@ __LJMP static int hlua_applet_htx_send_yield(lua_State *L, int status, lua_KCont
/* Copy data. */ /* Copy data. */
if (!htx_add_data(htx, ist2(data + l, max))) if (!htx_add_data(htx, ist2(data + l, max)))
goto snd_yield; goto snd_yield;
res->total += max;
res->flags |= CF_READ_PARTIAL;
htx_to_buf(htx, &res->buf); htx_to_buf(htx, &res->buf);
channel_add_input(res, max);
/* update counters. */ /* update counters. */
l += max; l += max;
@ -4988,8 +4986,7 @@ __LJMP static int hlua_applet_htx_send_response(lua_State *L)
} }
htx_to_buf(htx, &res->buf); htx_to_buf(htx, &res->buf);
res->total += htx->data; channel_add_input(res, htx->data);
res->flags |= CF_READ_PARTIAL;
/* Headers sent, set the flag. */ /* Headers sent, set the flag. */
appctx->appctx->ctx.hlua_apphttp.flags |= APPLET_HDR_SENT; appctx->appctx->ctx.hlua_apphttp.flags |= APPLET_HDR_SENT;
@ -7392,8 +7389,7 @@ static void hlua_applet_htx_fct(struct appctx *ctx)
si_rx_room_blk(si); si_rx_room_blk(si);
goto out; goto out;
} }
res->total++; channel_add_input(res, 1);
res->flags |= CF_READ_PARTIAL;
} }
done: done:
@ -7444,9 +7440,7 @@ static void hlua_applet_htx_fct(struct appctx *ctx)
res->buf.data = b_data(err); res->buf.data = b_data(err);
memcpy(res->buf.area, b_head(err), b_data(err)); memcpy(res->buf.area, b_head(err), b_data(err));
res_htx = htx_from_buf(&res->buf); res_htx = htx_from_buf(&res->buf);
channel_add_input(res, res_htx->data);
res->total += res_htx->data;
res->flags |= CF_READ_PARTIAL;
} }
if (!(strm->flags & SF_ERR_MASK)) if (!(strm->flags & SF_ERR_MASK))
strm->flags |= SF_ERR_RESOURCE; strm->flags |= SF_ERR_RESOURCE;