3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-01-15 18:38:00 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #67 from hintjens/master

Browse Source 
Backported fix for #1399
This commit is contained in:
Constantin Rack 2015-11-01 10:47:55 +01:00
commit 7bec6c1bdb
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -1,6 +1,8 @@
0MQ version 4.1.4 stable, released on 2015/xx/xx
================================================
* Fixed #1399 - assertion failure in tcp.cpp after network reconnect.
0MQ version 4.1.3 stable, released on 2015/08/17
================================================

2
src/tcp.cpp
View File

@ -192,7 +192,6 @@ int zmq::tcp_write (fd_t s_, const void *data_, size_t size_)
&& errno != EBADF
&& errno != EDESTADDRREQ
&& errno != EFAULT
&& errno != EINVAL
&& errno != EISCONN
&& errno != EMSGSIZE
&& errno != ENOMEM
@ -241,7 +240,6 @@ int zmq::tcp_read (fd_t s_, void *data_, size_t size_)
if (rc == -1) {
errno_assert (errno != EBADF
&& errno != EFAULT
&& errno != EINVAL
&& errno != ENOMEM
&& errno != ENOTSOCK);
if (errno == EWOULDBLOCK || errno == EINTR)