Commit d8077bb3 authored by Pieter Hintjens's avatar Pieter Hintjens

Merge pull request #1406 from rikvdh/master

Fix degradation from #1382, POLLOUT was tested but not requested
parents 099fd438 ae630cf3
...@@ -108,8 +108,8 @@ int zmq::proxy ( ...@@ -108,8 +108,8 @@ int zmq::proxy (
int more; int more;
size_t moresz; size_t moresz;
zmq_pollitem_t items [] = { zmq_pollitem_t items [] = {
{ frontend_, 0, ZMQ_POLLIN, 0 }, { frontend_, 0, ZMQ_POLLIN | ZMQ_POLLOUT, 0 },
{ backend_, 0, ZMQ_POLLIN, 0 }, { backend_, 0, ZMQ_POLLIN | ZMQ_POLLOUT, 0 },
{ control_, 0, ZMQ_POLLIN, 0 } { control_, 0, ZMQ_POLLIN, 0 }
}; };
int qt_poll_items = (control_ ? 3 : 2); int qt_poll_items = (control_ ? 3 : 2);
......
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