Merge pull request zeromq#28 from rikvdh/master

Fix degradation from zeromq#1382, POLLOUT was tested but not requested
mrvn · May 24, 2015 · 1d18b39 · 1d18b39
2 parents 934b599 + 3a0f218
commit 1d18b39
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/proxy.cpp b/src/proxy.cpp
@@ -108,8 +108,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);