diff options
author | Nick Mathewson <nickm@torproject.org> | 2011-01-01 21:17:31 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2011-01-01 21:17:31 -0500 |
commit | b42ce4bf08c8e70bf6b357d4e2e95885fff0d530 (patch) | |
tree | 5cdf1c4bf59848a3fc50f00bfcdb8181e0423767 | |
parent | 05f0195dd94fa8a84a2006bda8900f5f6b30cd40 (diff) | |
download | libevent-b42ce4bf08c8e70bf6b357d4e2e95885fff0d530.tar.gz |
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.
-rw-r--r-- | evport.c | 12 |
1 files changed, 8 insertions, 4 deletions
@@ -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]); |