3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-19 01:43:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #75 from hintjens/master

Browse Source 
Backported fixes from master
This commit is contained in:
Pieter Hintjens 2015-11-20 13:55:44 +02:00
commit e1e5a10dd1
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@ -1,10 +1,14 @@
0MQ version 4.1.4 stable, released on 2015/xx/xx 0MQ version 4.1.4 stable, released on 2015/xx/xx
================================================ ================================================
* Fixed #1315 - socket monitor hangs if bind/setsockopt failed.
* Fixed #1399 - assertion failure in tcp.cpp after network reconnect. * Fixed #1399 - assertion failure in tcp.cpp after network reconnect.
* Fixed #1632 - build failure using latest libsodium. * Fixed #1632 - build failure using latest libsodium.
* Fixed #1644 - assertion failure in msg.cpp:390 on STREAM sockets.
0MQ version 4.1.3 stable, released on 2015/08/17 0MQ version 4.1.3 stable, released on 2015/08/17
================================================ ================================================

2
src/stream_engine.cpp
View File

@ -842,7 +842,7 @@ int zmq::stream_engine_t::push_msg_to_session (msg_t *msg_)
} }
int zmq::stream_engine_t::push_raw_msg_to_session (msg_t *msg_) { int zmq::stream_engine_t::push_raw_msg_to_session (msg_t *msg_) {
if (metadata) if (metadata && metadata != msg_->metadata())
msg_->set_metadata(metadata); msg_->set_metadata(metadata);
return push_msg_to_session(msg_); return push_msg_to_session(msg_);
} }