Merge branch 'master' of github.com:zeromq/zeromq2-2

mikelikespie · Jul 31, 2011 · 5541600 · 5541600
2 parents 247dee1 + b6f45fe
commit 5541600
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/socket_base.cpp b/src/socket_base.cpp
@@ -492,6 +492,8 @@ int zmq::socket_base_t::send (::zmq_msg_t *msg_, int flags_)
     rc = xsend (msg_, flags_);
     if (rc == 0)
         return 0;
+    if (unlikely (errno != EAGAIN))
+        return -1;
 
     //  In case of non-blocking send we'll simply propagate
     //  the error - including EAGAIN - upwards.
@@ -541,6 +543,8 @@ int zmq::socket_base_t::recv (::zmq_msg_t *msg_, int flags_)
 
     //  Get the message.
     int rc = xrecv (msg_, flags_);
+    if (unlikely (rc != 0 && errno != EAGAIN))
+        return -1;
     int err = errno;
 
     //  Once every inbound_poll_rate messages check for signals and process