issue 40 - nbytes != -1 (tcp_socket.cpp:216)

1f61c87a · Martin Hurton · fd707fed · 1f61c87a
Commit 1f61c87a authored Jul 07, 2010 by Martin Hurton
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

tcp_socket.cpp src/tcp_socket.cpp +2 -1

No files found.
--- a/src/tcp_socket.cpp
+++ b/src/tcp_socket.cpp
@@ -210,7 +210,8 @@ int zmq::tcp_socket_t::read (void *data, int size)
        return 0;

    //  Signalise peer failure.
-    if (nbytes == -1 && (errno == ECONNRESET || errno == ECONNREFUSED))
+    if (nbytes == -1 && (errno == ECONNRESET || errno == ECONNREFUSED ||
+          errno == ETIMEDOUT))
        return -1;

    errno_assert (nbytes != -1);