generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-10-14 15:05:38 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
pending termination while processing an error

Solution: terminate pipe instead

Fixes #2723
This commit is contained in:
sigiesec
2017-08-31 21:00:01 +02:00
parent eb8105cde1
commit 23e018f37a
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/session_base.cpp
View File

@@ -434,13 +434,19 @@ void zmq::session_base_t::engine_error (
switch (reason) { switch (reason) {
case stream_engine_t::timeout_error: case stream_engine_t::timeout_error:
case stream_engine_t::connection_error: case stream_engine_t::connection_error:
if (active) if (active) {
reconnect (); reconnect ();
else break;
terminate (); }
break;
case stream_engine_t::protocol_error: case stream_engine_t::protocol_error:
terminate (); if (pending) {
if (pipe)
pipe->terminate (0);
if (zap_pipe)
zap_pipe->terminate (0);
} else {
terminate ();
}
break; break;
} }