generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-11-07 05:58:45 +01:00
Code Issues Projects Releases Wiki Activity

Revert "Revert "Merge branch 'master' of github.com:ianbarber/libzmq""

Browse Source 
This reverts commit 029d3dfae2.
This commit is contained in:
Ian Barber
2012-06-12 14:43:18 +01:00
parent bdd4e1351d
commit eb14890d23
15 changed files with 331 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/socket_base.cpp
View File

@@ -970,7 +970,11 @@ void zmq::socket_base_t::write_activated (pipe_t *pipe_)
void zmq::socket_base_t::hiccuped (pipe_t *pipe_)
{
xhiccuped (pipe_);
if (options.delay_attach_on_connect == 1)
pipe_->terminate (false);
else
// Notify derived sockets of the hiccup
xhiccuped (pipe_);
}
void zmq::socket_base_t::terminated (pipe_t *pipe_)