From b42ce4bf08c8e70bf6b357d4e2e95885fff0d530 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Sat, 1 Jan 2011 21:17:31 -0500 Subject: [PATCH] Fix evport handling of POLLHUP and POLLERR In other backends, they make _all_ events trigger; with evport they previously triggered nothing. Found by Phua Keat Yee. --- evport.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/evport.c b/evport.c index 4301a39c..9ad2289b 100644 --- a/evport.c +++ b/evport.c @@ -336,10 +336,14 @@ evport_dispatch(struct event_base *base, struct timeval *tv) * (because we have to pass this to the callback) */ res = 0; - if (pevt->portev_events & POLLIN) - res |= EV_READ; - if (pevt->portev_events & POLLOUT) - res |= EV_WRITE; + if (pevt->portev_events & (POLLERR|POLLHUP)) { + res = EV_READ | EV_WRITE; + } else { + if (pevt->portev_events & POLLIN) + res |= EV_READ; + if (pevt->portev_events & POLLOUT) + res |= EV_WRITE; + } EVUTIL_ASSERT(epdp->ed_nevents > fd); fdi = &(epdp->ed_fds[fd]); -- 2.50.0