tevent: preferr the write handler in there're two possible handlers registered with...

Signed-off-by: Stefan Metzmacher <metze@samba.org>

diff --git a/lib/tevent/tevent_epoll.c b/lib/tevent/tevent_epoll.c
index 329ec0ad90fd11d92dadebea0d095dd6c6d34d17..6812939273cb33ef48ac83d63162992739a0de59 100644 (file)
--- a/lib/tevent/tevent_epoll.c
+++ b/lib/tevent/tevent_epoll.c
@@ -674,6 +674,16 @@ static int epoll_event_loop(struct epoll_event_context *epoll_ev, struct timeval
                if (events[i].events & EPOLLIN) flags |= TEVENT_FD_READ;
                if (events[i].events & EPOLLOUT) flags |= TEVENT_FD_WRITE;
 
+               if (flags & TEVENT_FD_WRITE) {
+                       if (fde->flags & TEVENT_FD_WRITE) {
+                               mpx_fde = NULL;
+                       }
+                       if (mpx_fde && mpx_fde->flags & TEVENT_FD_WRITE) {
+                               fde = mpx_fde;
+                               mpx_fde = NULL;
+                       }
+               }
+
                if (mpx_fde) {
                        /* Ensure we got the right fde. */
                        if ((flags & fde->flags) == 0) {