From d250e7c04ccafe9090d34298ede98c4a7511aba4 Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Thu, 14 Jan 2016 23:51:24 +0000 Subject: [PATCH] Remove events when 0 or error are returned --- src/libserver/rspamd_control.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/libserver/rspamd_control.c b/src/libserver/rspamd_control.c index 6f0bd8a4dd..e274f100b2 100644 --- a/src/libserver/rspamd_control.c +++ b/src/libserver/rspamd_control.c @@ -548,16 +548,25 @@ rspamd_control_default_worker_handler (gint fd, short what, gpointer ud) gssize r; - r = read (fd, &cmd, sizeof (cmd)); if (r == -1) { msg_err ("cannot read request from the control socket: %s", strerror (errno)); + + if (errno != EAGAIN && errno != EINTR) { + event_del (&cd->io_ev); + close (fd); + } } else if (r < (gint)sizeof (cmd)) { msg_err ("short read of control command: %d of %d", (gint)r, (gint)sizeof (cmd)); + + if (r == 0) { + event_del (&cd->io_ev); + close (fd); + } } else if ((gint)cmd.type >= 0 && cmd.type < RSPAMD_CONTROL_MAX) { -- 2.47.3