mirror of
https://github.com/zeromq/libzmq.git
synced 2025-03-23 21:37:46 +00:00
Merge pull request #115 from bluca/linger_fix_backport
Problem: connection might terminate prematurely
This commit is contained in:
commit
197a9e05e2
2
NEWS
2
NEWS
@ -15,6 +15,8 @@
|
|||||||
|
|
||||||
* Fixed #1850 - detection issues with tweetnacl/libsodium.
|
* Fixed #1850 - detection issues with tweetnacl/libsodium.
|
||||||
|
|
||||||
|
* Fixed #1877 - Avoid terminating connections prematurely
|
||||||
|
|
||||||
|
|
||||||
0MQ version 4.1.4 stable, released on 2015/12/18
|
0MQ version 4.1.4 stable, released on 2015/12/18
|
||||||
================================================
|
================================================
|
||||||
|
@ -454,7 +454,8 @@ void zmq::session_base_t::process_term (int linger_)
|
|||||||
// TODO: Should this go into pipe_t::terminate ?
|
// TODO: Should this go into pipe_t::terminate ?
|
||||||
// In case there's no engine and there's only delimiter in the
|
// 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 it wouldn't be ever read. Thus we check for it explicitly.
|
||||||
pipe->check_read ();
|
if (!engine)
|
||||||
|
pipe->check_read ();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (zap_pipe != NULL)
|
if (zap_pipe != NULL)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user