Patches from sub-forward branch incorporated

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>

1 files changed, 5 insertions, 2 deletions

diff --git a/src/connect_session.cpp b/src/connect_session.cpp
index 9a29bf1..fe7332a 100644
--- a/src/connect_session.cpp
+++ b/src/connect_session.cpp
@@ -111,7 +111,7 @@ void zmq::connect_session_t::start_connecting (bool wait_)
     zmq_assert (false);
 }
 
-bool zmq::connect_session_t::attached (const blob_t &peer_identity_)
+bool zmq::connect_session_t::xattached (const blob_t &peer_identity_)
 {
     //  If there was no previous connection...
     if (!connected) {
@@ -153,9 +153,12 @@ bool zmq::connect_session_t::attached (const blob_t &peer_identity_)
     return true;
 }
 
-void zmq::connect_session_t::detached ()
+bool zmq::connect_session_t::xdetached ()
 {
     //  Reconnect.
     start_connecting (true);
+
+    //  Don't tear the session down.
+    return true;
 }