summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@250bpm.com>2010-09-28 07:39:16 +0200
committerMartin Sustrik <sustrik@250bpm.com>2010-09-28 07:39:16 +0200
commitf61921d09679c4bed15204ec4e55d1c7313e3f6a (patch)
tree42434bc06dcf42cbefba2acc576050f152be214b /src
parent9129b792486b87d4f54607321427c2df783c9ec1 (diff)
REQ socket can die when reply is delivered on wrong unerlying connection -- fixed
Diffstat (limited to 'src')
-rw-r--r--src/req.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/req.cpp b/src/req.cpp
index f3695a2..a77c061 100644
--- a/src/req.cpp
+++ b/src/req.cpp
@@ -111,10 +111,8 @@ void zmq::req_t::xkill (class reader_t *pipe_)
void zmq::req_t::xrevive (class reader_t *pipe_)
{
- // TODO: Actually, misbehaving peer can cause this kind of thing.
- // Handle it decently, presumably kill the offending connection.
- zmq_assert (pipe_ == reply_pipe);
- reply_pipe_active = true;
+ if (pipe_ == reply_pipe)
+ reply_pipe_active = true;
}
void zmq::req_t::xrevive (class writer_t *pipe_)