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

BUG/MEDIUM: lua: socket destroy before reading pending data

Browse Source 
When the channel is down, the applet is waked up. Before this patch,
the applet closes the stream and the unread data are discarded.

After this patch, the stream is not closed except if the buffers are
empty.

It will be closed later by the close function, or by the garbage collector.
This commit is contained in:
Thierry FOURNIER 2015-09-27 19:29:38 +02:00 committed by Willy Tarreau
parent 8c8fbbe103
commit 6d695e6314
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/hlua.c
View File

@ -1555,12 +1555,10 @@ static void hlua_socket_handler(struct appctx *appctx)
struct stream_interface *si = appctx->owner;
struct connection *c = objt_conn(si_opposite(si)->end);
/* Wakeup the main stream if the client connection is closed. */
if (!c || channel_output_closed(si_ic(si)) || channel_input_closed(si_oc(si))) {
if (appctx->ctx.hlua.socket) {
appctx->ctx.hlua.socket->s = NULL;
appctx->ctx.hlua.socket = NULL;
}
/* If the connection object is not avalaible, close all the
* streams and wakeup everithing waiting for.
*/
if (!c) {
si_shutw(si);
si_shutr(si);
si_ic(si)->flags |= CF_READ_NULL;
@ -1569,6 +1567,14 @@ static void hlua_socket_handler(struct appctx *appctx)
return;
}
/* If we cant write, wakeup the pending write signals. */
if (channel_output_closed(si_ic(si)))
hlua_com_wake(&appctx->ctx.hlua.wake_on_write);
/* If we cant read, wakeup the pending read signals. */
if (channel_input_closed(si_oc(si)))
hlua_com_wake(&appctx->ctx.hlua.wake_on_read);
/* if the connection is not estabkished, inform the stream that we want
* to be notified whenever the connection completes.
*/