Merge pull request #545 from hurtonm/master

Interoperate with higher versions of ZMTP protocol
This commit is contained in:
Pieter Hintjens 2013-04-14 14:27:32 -07:00
commit f4a07b3951

View File

@ -478,9 +478,7 @@ bool zmq::stream_engine_t::handshake ()
in_batch_size, options.maxmsgsize);
alloc_assert (decoder);
}
else
if (greeting_recv [revision_pos] == ZMTP_2_0
|| greeting_recv [revision_pos] == ZMTP_2_1) {
else {
encoder = new (std::nothrow) v2_encoder_t (out_batch_size);
alloc_assert (encoder);