From 75ba4c7292bc09e7fc58dd206447777391d06100 Mon Sep 17 00:00:00 2001 From: Pieter Hintjens Date: Sun, 24 Nov 2013 19:00:18 +0100 Subject: [PATCH 1/3] Updated version number for release 4.0.4 --- include/zmq.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/zmq.h b/include/zmq.h index f7b10db6..78e594f1 100644 --- a/include/zmq.h +++ b/include/zmq.h @@ -31,7 +31,7 @@ /* Version macros for compile-time API version detection */ #define ZMQ_VERSION_MAJOR 4 #define ZMQ_VERSION_MINOR 0 -#define ZMQ_VERSION_PATCH 3 +#define ZMQ_VERSION_PATCH 4 #define ZMQ_MAKE_VERSION(major, minor, patch) \ ((major) * 10000 + (minor) * 100 + (patch)) From ff8f97e7d770651ef2e50e6f2a36069ae78e7814 Mon Sep 17 00:00:00 2001 From: Martin Hurton Date: Sat, 30 Nov 2013 21:24:32 +0100 Subject: [PATCH 2/3] Fix issue #763 --- src/stream_engine.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/stream_engine.cpp b/src/stream_engine.cpp index 68780d28..cb70680b 100644 --- a/src/stream_engine.cpp +++ b/src/stream_engine.cpp @@ -507,6 +507,13 @@ bool zmq::stream_engine_t::handshake () // message into the incoming message stream. if (options.type == ZMQ_PUB || options.type == ZMQ_XPUB) subscription_required = true; + + // We are sending our identity now and the next message + // will come from the socket. + read_msg = &stream_engine_t::pull_msg_from_session; + + // We are expecting identity message. + write_msg = &stream_engine_t::write_identity; } else if (greeting_recv [revision_pos] == ZMTP_1_0) { From d958b675c7918c05b92c3e0cfbd49601142cdefd Mon Sep 17 00:00:00 2001 From: Pieter Hintjens Date: Sun, 1 Dec 2013 11:54:55 +0100 Subject: [PATCH 3/3] Updated NEWS for #763 --- NEWS | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/NEWS b/NEWS index fe6011cd..521142fc 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,13 @@ +0MQ version 4.0.4 stable, released on 2013/xx/xx +================================================ + +Bug Fixes +--------- + +* Fixed #763; when talking to a ZMTP v1 peer (libzmq 2.2), a socket would + send an extra identity frame at the start of the connection. + + 0MQ version 4.0.3 stable, released on 2013/11/24 ================================================