Fixed issue #2227 second part

- removed the previously added encryption_error, less changes less bug
 - handshake fail is now signaled when an error happen while the
   mechanism is still hanshaking
This commit is contained in:
Vincent Tellier
2016-12-31 15:13:57 +01:00
parent ee98e7dca0
commit ffb31dcadd
3 changed files with 4 additions and 10 deletions

View File

@@ -421,8 +421,7 @@ void zmq::session_base_t::engine_error (
if (pipe)
clean_pipes ();
zmq_assert (reason == stream_engine_t::encryption_error
|| reason == stream_engine_t::connection_error
zmq_assert (reason == stream_engine_t::connection_error
|| reason == stream_engine_t::timeout_error
|| reason == stream_engine_t::protocol_error);
@@ -434,7 +433,6 @@ void zmq::session_base_t::engine_error (
else
terminate ();
break;
case stream_engine_t::encryption_error:
case stream_engine_t::protocol_error:
terminate ();
break;