0
0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-27 15:41:05 +08:00

Merge pull request #151 from bluca/lingex_fix_backport

Problem: connection might terminate prematurely
This commit is contained in:
Pieter Hintjens 2016-03-30 19:41:45 +02:00
commit 284c743814
2 changed files with 4 additions and 1 deletions

2
NEWS
View File

@ -7,6 +7,8 @@
* Fixed #1807 - build broken with GCC 6.
* Fixed #1877 - Avoid terminating connections prematurely
0MQ version 4.0.7 stable, released on 2015/06/15
================================================

View File

@ -421,7 +421,8 @@ void zmq::session_base_t::process_term (int linger_)
// TODO: Should this go into pipe_t::terminate ?
// In case there's no engine and there's only delimiter in the
// pipe it wouldn't be ever read. Thus we check for it explicitly.
pipe->check_read ();
if (!engine)
pipe->check_read ();
}
if (zap_pipe != NULL)