Commit 90528626 authored by Constantin Rack's avatar Constantin Rack Committed by GitHub

Merge pull request #2250 from bluca/poll_regression

Problem: check for item.fd causes zloop_poller regression
parents c47e017b 72176d5f
......@@ -834,7 +834,7 @@ inline int zmq_poller_poll (zmq_pollitem_t *items_, int nitems_, long timeout_)
for (int j = j_start; j < found_events; ++j) {
if (
(items_[i].socket && items_[i].socket == events[j].socket) ||
(!(items_[i].socket || items_[j].socket) && items_[i].fd == events[j].fd)
(!items_[i].socket && items_[i].fd == events[j].fd)
) {
items_[i].revents = events[j].events & items_[i].events;
if (!repeat_items) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment