common 81f518d: TCPSocket: let recv throw Interrupted on EINTR

1 files changed, 7 insertions, 2 deletions

diff --git a/contrib/Socket.cpp b/contrib/Socket.cpp
index bc1b179..d41ed1c 100644
--- a/contrib/Socket.cpp
+++ b/contrib/Socket.cpp
@@ -630,8 +630,13 @@ ssize_t TCPSocket::recv(void *buffer, size_t length, int flags)
 {
     ssize_t ret = ::recv(m_sock, buffer, length, flags);
     if (ret == -1) {
-        std::string errstr(strerror(errno));
-        throw std::runtime_error("TCP receive error: " + errstr);
+        if (errno == EINTR) {
+            throw Interrupted();
+        }
+        else {
+            std::string errstr(strerror(errno));
+            throw std::runtime_error("TCP receive error: " + errstr);
+        }
     }
     return ret;
 }