Merge pull request #166 from pijyoi/master

Problem: pubsub inproc bug not backported
This commit is contained in:
Luca Boccassi 2017-04-07 09:11:41 +01:00 committed by GitHub
commit 44c56a8e09

View File

@ -518,9 +518,6 @@ int zmq::socket_base_t::connect (const char *addr_)
int rc = pipepair (parents, new_pipes, hwms, conflates);
errno_assert (rc == 0);
// Attach local end of the pipe to this socket object.
attach_pipe (new_pipes [0]);
if (!peer.socket) {
// The peer doesn't exist yet so we don't know whether
// to send the identity message or not. To resolve this,
@ -569,6 +566,9 @@ int zmq::socket_base_t::connect (const char *addr_)
send_bind (peer.socket, new_pipes [1], false);
}
// Attach local end of the pipe to this socket object.
attach_pipe (new_pipes [0]);
// Save last endpoint URI
last_endpoint.assign (addr_);