Merge branch 'develop' into features/getdns_context_set_logfunc

This commit is contained in:
Willem Toorop 2017-06-28 21:22:55 +02:00
commit 19479d4089
1 changed files with 2 additions and 2 deletions

View File

@ -435,13 +435,13 @@ poll_eventloop_run_once(getdns_eventloop *loop, int blocking)
poll_loop->pfds[i].fd = -1; poll_loop->pfds[i].fd = -1;
} }
if (poll_loop->fd_events[j].event->write_cb && if (poll_loop->fd_events[j].event->write_cb &&
poll_loop->pfds[j].revents & POLLOUT) poll_loop->pfds[j].revents & (POLLOUT|POLLERR|POLLHUP|POLLNVAL))
poll_write_cb( poll_loop->pfds[j].fd poll_write_cb( poll_loop->pfds[j].fd
, poll_loop->fd_events[j].event); , poll_loop->fd_events[j].event);
if (poll_loop->fd_events[j].event && if (poll_loop->fd_events[j].event &&
poll_loop->fd_events[j].event->read_cb && poll_loop->fd_events[j].event->read_cb &&
poll_loop->pfds[j].revents & POLLIN) poll_loop->pfds[j].revents & (POLLIN|POLLERR|POLLHUP|POLLNVAL))
poll_read_cb( poll_loop->pfds[j].fd poll_read_cb( poll_loop->pfds[j].fd
, poll_loop->fd_events[j].event); , poll_loop->fd_events[j].event);
} }