Commit 23e018f3 authored by sigiesec's avatar sigiesec

Problem: termination is requested from a session's owner when already in

pending termination while processing an error

Solution: terminate pipe instead

Fixes #2723
parent eb8105cd
......@@ -434,13 +434,19 @@ void zmq::session_base_t::engine_error (
switch (reason) {
case stream_engine_t::timeout_error:
case stream_engine_t::connection_error:
if (active)
if (active) {
reconnect ();
else
terminate ();
break;
}
case stream_engine_t::protocol_error:
if (pending) {
if (pipe)
pipe->terminate (0);
if (zap_pipe)
zap_pipe->terminate (0);
} else {
terminate ();
}
break;
}
......
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