Permalink
Browse files

Merge pull request #44 from pieterh/master

Fixed issue LIBZMQ-293 - libzmq doesn't follow ZMTP/1.0 spec
  • Loading branch information...
2 parents 25c7cd0 + 48f70a8 commit 24f1175d942323697bff6ed1690ffbdcf2f33631 Chuck Remes committed Mar 20, 2012
Showing with 5 additions and 3 deletions.
  1. +3 −1 NEWS
  2. +2 −2 src/encoder.cpp
View
4 NEWS
@@ -1,4 +1,4 @@
-0MQ version 2.1.12 (Stable), released on 2012/01/xx
+0MQ version 2.1.12 (Stable), released on 2012/xx/xx
===================================================
Bug fixes
@@ -10,6 +10,8 @@ Bug fixes
* Fixed issue 332, libzmq doesn't compile on Android NDK.
+* Fixed issue 293, libzmq doesn't follow ZMTP/1.0 spec.
+
0MQ version 2.1.11 (Stable), released on 2011/12/18
===================================================
View
@@ -75,14 +75,14 @@ bool zmq::encoder_t::message_ready ()
// message size. In both cases 'flags' field follows.
if (size < 255) {
tmpbuf [0] = (unsigned char) size;
- tmpbuf [1] = (in_progress.flags & ~ZMQ_MSG_SHARED);
+ tmpbuf [1] = (in_progress.flags & ZMQ_MSG_MORE);
next_step (tmpbuf, 2, &encoder_t::size_ready,
!(in_progress.flags & ZMQ_MSG_MORE));
}
else {
tmpbuf [0] = 0xff;
put_uint64 (tmpbuf + 1, size);
- tmpbuf [9] = (in_progress.flags & ~ZMQ_MSG_SHARED);
+ tmpbuf [9] = (in_progress.flags & ZMQ_MSG_MORE);
next_step (tmpbuf, 10, &encoder_t::size_ready,
!(in_progress.flags & ZMQ_MSG_MORE));
}

0 comments on commit 24f1175

Please sign in to comment.