Merge pull request #281 from pieterh/master

Applied patch for issue #293 - zmq 2.1 doesn't follow the ZMTP/1.0 spec

src/encoder.cpp

 /*
+    Copyright (c) 2007-2012 iMatix Corporation
     Copyright (c) 2009-2011 250bpm s.r.o.
-    Copyright (c) 2007-2009 iMatix Corporation
     Copyright (c) 2011 VMware, Inc.
     Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
 
@@ -89,14 +89,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 () & ~msg_t::shared);
+        tmpbuf [1] = (in_progress.flags () & msg_t::more);
         next_step (tmpbuf, 2, &encoder_t::size_ready,
             !(in_progress.flags () & msg_t::more));
     }
     else {
         tmpbuf [0] = 0xff;
         put_uint64 (tmpbuf + 1, size);
-        tmpbuf [9] = (in_progress.flags () & ~msg_t::shared);
+        tmpbuf [9] = (in_progress.flags () & msg_t::more);
         next_step (tmpbuf, 10, &encoder_t::size_ready,
             !(in_progress.flags () & msg_t::more));
     }