diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-06-27 18:46:20 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-06-27 18:46:20 +0000 |
| commit | c933bf105b0de89e3fd524517daf163a16dd0d44 (patch) | |
| tree | 50cb525f946e4ac65a416178766e2e124167a40f /libnetdata/socket/socket.c | |
| parent | Releasing debian version 1.40.0-2. (diff) | |
| download | netdata-c933bf105b0de89e3fd524517daf163a16dd0d44.tar.xz netdata-c933bf105b0de89e3fd524517daf163a16dd0d44.zip | |
Merging upstream version 1.40.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'libnetdata/socket/socket.c')
| -rw-r--r-- | libnetdata/socket/socket.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libnetdata/socket/socket.c b/libnetdata/socket/socket.c index 220db7601..7f0b81fee 100644 --- a/libnetdata/socket/socket.c +++ b/libnetdata/socket/socket.c @@ -1052,19 +1052,22 @@ ssize_t recv_timeout(int sockfd, void *buf, size_t len, int flags, int timeout) return -1; } - if(!retval) + if(!retval) { // timeout return 0; + } if(fd.revents & POLLIN) break; } #ifdef ENABLE_HTTPS - if (SSL_connection(ssl)) + if (SSL_connection(ssl)) { return netdata_ssl_read(ssl, buf, len); + } #endif + internal_error(true, "%s(): calling recv()", __FUNCTION__ ); return recv(sockfd, buf, len, flags); } |