Merge pull request #115 from rikvdh/master

Fix degradation from #1382, POLLOUT was tested but not requested
zeromq · May 24, 2015 · 60568f2 · 60568f2
2 parents 1a86783 + 683059d
commit 60568f2
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/proxy.cpp b/src/proxy.cpp
@@ -71,8 +71,8 @@ int zmq::proxy (
  int more;
  size_t moresz;
  zmq_pollitem_t items [] = {
- { frontend_, 0, ZMQ_POLLIN, 0 },
- { backend_, 0, ZMQ_POLLIN, 0 },
+ { frontend_, 0, ZMQ_POLLIN | ZMQ_POLLOUT, 0 },
+ { backend_, 0, ZMQ_POLLIN | ZMQ_POLLOUT, 0 },
  { control_, 0, ZMQ_POLLIN, 0 }
  };
  int qt_poll_items = (control_ ? 3 : 2);