Merge pull request #2615 from bluca/curve_server_reconnect

Problem: CURVE server (connect) fails when client rebinds

Merge pull request #2615 from bluca/curve_server_reconnect
Problem: CURVE server (connect) fails when client rebinds
30ab0ed8 · Doron Somech · GitHub · 4e6c89e3 · d04065b7 · 30ab0ed8
Commit 30ab0ed8 authored Jul 01, 2017 by Doron Somech Committed by GitHub Jul 01, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

session_base.cpp src/session_base.cpp +2 -1

No files found.
--- a/src/session_base.cpp
+++ b/src/session_base.cpp
@@ -323,7 +323,8 @@ void zmq::session_base_t::process_plug ()
 //  security flaw.
 int zmq::session_base_t::zap_connect ()
 {
-    zmq_assert (zap_pipe == NULL);
+    if (zap_pipe != NULL)
+        return 0;

    endpoint_t peer = find_endpoint ("inproc://zeromq.zap.01");
    if (peer.socket == NULL) {