When detecting EPOLLIN, always invoke read handler first. This ensures that even when error conditions (i.e., EPOLLHUP and/or EPOLLERR) are encountered, any residual data is still delivered to the client. --- ell/io.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ell/io.c b/ell/io.c index 41ff6dd..a9e0a38 100644 --- a/ell/io.c +++ b/ell/io.c @@ -111,14 +111,6 @@ static void io_callback(int fd, uint32_t events, void *user_data) { struct l_io *io = user_data; - if (unlikely(events & (EPOLLERR | EPOLLHUP))) { - l_util_debug(io->debug_handler, io->debug_data, - "disconnect event <%p>", io); - watch_remove(io->fd, !io->close_on_destroy); - io_closed(io); - return; - } - if ((events & EPOLLIN) && io->read_handler) { l_util_debug(io->debug_handler, io->debug_data, "read event <%p>", io); @@ -142,6 +134,14 @@ static void io_callback(int fd, uint32_t events, void *user_data) } } + if (unlikely(events & (EPOLLERR | EPOLLHUP))) { + l_util_debug(io->debug_handler, io->debug_data, + "disconnect event <%p>", io); + watch_remove(io->fd, !io->close_on_destroy); + io_closed(io); + return; + } + if ((events & EPOLLOUT) && io->write_handler) { l_util_debug(io->debug_handler, io->debug_data, "write event <%p>", io); -- 2.26.2