1 files changed, 8 insertions, 2 deletions
diff --git a/src/req.cpp b/src/req.cpp
index 04a19fb..0832f60 100644
--- a/src/req.cpp
+++ b/src/req.cpp
@@ -92,14 +92,20 @@ int zmq::req_t::xrecv (msg_t *msg_, int flags_)
 
         // TODO: This should also close the connection with the peer!
         if (unlikely (!(msg_->flags () & msg_t::label) || msg_->size () != 4)) {
+            while (true) {
+                int rc = xreq_t::xrecv (msg_, flags_);
+                errno_assert (rc == 0);
+                if (!(msg_->flags () & (msg_t::label | msg_t::more)))
+                    break;
+            }
+            msg_->close ();
+            msg_->init ();
             errno = EAGAIN;
             return -1;
         }
         
         unsigned char *data = (unsigned char*) msg_->data ();
         if (unlikely (get_uint32 (data) != request_id)) {
-
-            //  The request ID does not match. Drop the entire message.
             while (true) {
                 int rc = xreq_t::xrecv (msg_, flags_);
                 errno_assert (rc == 0);