From 6d695e6314ffcf96ebd493d38835b9bd4db90f71 Mon Sep 17 00:00:00 2001 From: Thierry FOURNIER Date: Sun, 27 Sep 2015 19:29:38 +0200 Subject: [PATCH] BUG/MEDIUM: lua: socket destroy before reading pending data 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. --- src/hlua.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/hlua.c b/src/hlua.c index c9cbca037..0c8d1b128 100644 --- a/src/hlua.c +++ b/src/hlua.c @@ -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. */