Merge pull request #3729 from bluca/fd_oob

Problem: WSAEventSelect checks for FD_OOB, but select does not
This commit is contained in:
Constantin Rack 2019-11-01 10:06:18 +00:00 committed by GitHub
commit c57b2a5cc4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -376,16 +376,13 @@ void zmq::select_t::loop ()
rc =
WSAEventSelect (fd, wsa_events.events[3],
FD_READ | FD_ACCEPT | FD_CLOSE
| FD_WRITE | FD_CONNECT | FD_OOB);
| FD_WRITE | FD_CONNECT);
else if (FD_ISSET (fd, &family_entry.fds_set.read))
rc = WSAEventSelect (fd, wsa_events.events[0],
FD_READ | FD_ACCEPT | FD_CLOSE
| FD_OOB);
FD_READ | FD_ACCEPT | FD_CLOSE);
else if (FD_ISSET (fd, &family_entry.fds_set.write))
rc = WSAEventSelect (fd, wsa_events.events[1],
FD_WRITE | FD_CONNECT | FD_OOB);
else if (FD_ISSET (fd, &family_entry.fds_set.error))
rc = WSAEventSelect (fd, wsa_events.events[2], FD_OOB);
FD_WRITE | FD_CONNECT);
else
rc = 0;