From: Olivier Houchard <cognet@ci0.org>
Date: Tue, 10 Dec 2019 17:22:55 +0000 (+0100)
Subject: BUG/MEDIUM: kqueue: Make sure we report read events even when no data.
X-Git-Tag: v2.2-dev1~196
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eaefc3c5032506e89cceb6ad5fdd1c5955c4ea66;p=thirdparty%2Fhaproxy.git

BUG/MEDIUM: kqueue: Make sure we report read events even when no data.

When we have a EVFILT_READ event, an optimization was made, and the FD was
not reported as ready to receive if there were no data available. That way,
if the socket was closed by our peer (the EV8EOF flag was set), and there were
no remaining data to read, we would just close(), and avoid doing a recv().
However, it may be fine for TCP socket, but it is not for UDP.
If we send data via UDP, and we receive an error, the only way to detect it
is to attempt a recv(). However, in this case, kevent() will report a read
event, but with no data, so we'd just ignore that read event, nothing would be
done about it, and the poller would be woken up by it over and over.
To fix this, report read events if either we have data, or the EV_EOF flag
is not set.

This should be backported to 2.1, 2.0, 1.9 and 1.8.
---

diff --git a/src/ev_kqueue.c b/src/ev_kqueue.c
index 8f0b7c9072..98fac85202 100644
--- a/src/ev_kqueue.c
+++ b/src/ev_kqueue.c
@@ -197,7 +197,7 @@ REGPRM3 static void _do_poll(struct poller *p, int exp, int wake)
 		}
 
 		if (kev[count].filter == EVFILT_READ) {
-			if (kev[count].data)
+			if (kev[count].data || !(kev[count].flags & EV_EOF))
 				n |= FD_EV_READY_R;
 			if (kev[count].flags & EV_EOF)
 				n |= FD_EV_SHUT_R;