RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-17 08:54:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MINOR: Fix the sending function in Lua's cosocket

Browse Source 
This is a regression from the commit a73e59b690.

When data are sent from a cosocket, the action is done in the context of the
applet running a lua stack and not in the context of the applet owning the
cosocket. So we must take care, explicitly, that this last applet have a buffer
(the req buffer of the cosocket).

This patch must be backported in 1.7
This commit is contained in:
Christopher Faulet 2016-12-19 09:29:06 +01:00 committed by Willy Tarreau
parent 6e413ed1ed
commit 33834b15dc
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/hlua.c
View File

@ -1889,14 +1889,19 @@ static int hlua_socket_write_yield(struct lua_State *L,int status, lua_KContext
* the request buffer if its not required.
*/
if (socket->s->req.buf->size == 0) {
si_applet_cant_put(&socket->s->si[0]);
goto hlua_socket_write_yield_return;
appctx = hlua->task->context;
if (!channel_alloc_buffer(&socket->s->req, &appctx->buffer_wait))
goto hlua_socket_write_yield_return;
}
/* Check for avalaible space. */
len = buffer_total_space(socket->s->req.buf);
if (len <= 0)
if (len <= 0) {
appctx = objt_appctx(socket->s->si[0].end);
if (!hlua_com_new(&hlua->com, &appctx->ctx.hlua_cosocket.wake_on_write, hlua->task))
WILL_LJMP(luaL_error(L, "out of memory"));
goto hlua_socket_write_yield_return;
}
/* send data */
if (len < send_len)
@ -1934,9 +1939,6 @@ static int hlua_socket_write_yield(struct lua_State *L,int status, lua_KContext
return 1;
hlua_socket_write_yield_return:
appctx = objt_appctx(socket->s->si[0].end);
if (!hlua_com_new(&hlua->com, &appctx->ctx.hlua_cosocket.wake_on_write, hlua->task))
WILL_LJMP(luaL_error(L, "out of memory"));
WILL_LJMP(hlua_yieldk(L, 0, 0, hlua_socket_write_yield, TICK_ETERNITY, 0));
return 0;
}