upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-11 10:01:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

4528. [bug] Only set the flag bits for the i/o we are waiting

Browse source 
for on EPOLLERR or EPOLLHUP. [RT #43617]

(cherry picked from commit c1619b8420)
This commit is contained in:
Mark Andrews 2016-12-08 16:59:46 +11:00
parent 45cd9d8bcd
commit 87dbe24a4f
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGES
View file

@ -1,3 +1,6 @@
4528. [bug] Only set the flag bits for the i/o we are waiting
for on EPOLLERR or EPOLLHUP. [RT #43617]
4527. [doc] Support DocBook XSL Stylesheets v1.79.1. [RT #43831]
4526. [doc] Corrected errors and improved formatting of

3
lib/isc/unix/socket.c
View file

@ -3774,7 +3774,8 @@ process_fds(isc__socketmgr_t *manager, struct epoll_event *events, int nevents)
* events. Note also that the read or write attempt
* won't block because we use non-blocking sockets.
*/
events[i].events |= (EPOLLIN | EPOLLOUT);
int fd = events[i].data.fd;
events[i].events |= manager->epoll_events[fd];
}
process_fd(manager, events[i].data.fd,
(events[i].events & EPOLLIN) != 0,