From 333ae3b82f57b05135ee2b25a63c057b30e23673 Mon Sep 17 00:00:00 2001
From: John <ebusd@ebusd.eu>
Date: Sat, 17 Jun 2023 10:08:34 +0200
Subject: [PATCH] apply same workaround to all BIO_should_retry() calls and log
 timeout in send+recv as well

---
 src/lib/utils/httpclient.cpp | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/lib/utils/httpclient.cpp b/src/lib/utils/httpclient.cpp
index d90bd2a7..35b05e20 100755
--- a/src/lib/utils/httpclient.cpp
+++ b/src/lib/utils/httpclient.cpp
@@ -86,6 +86,7 @@ SSLSocket::~SSLSocket() {
 }
 
 ssize_t SSLSocket::send(const char* data, size_t len) {
+  time_t now = 0;
   do {
 #if OPENSSL_VERSION_NUMBER >= 0x10101000L
     size_t part = 0;
@@ -99,18 +100,23 @@ ssize_t SSLSocket::send(const char* data, size_t len) {
       return static_cast<ssize_t>(res);
     }
 #endif
-    if (!BIO_should_retry(m_bio)) {
+    if (!BIO_should_retry(m_bio) && now > 0) {  // always repeat on first failure
       if (isError("send", true)) {
         return -1;
       }
       return 0;
     }
+    if ((now=time(nullptr)) > m_until) {
+      logError(lf_network, "HTTP send: timed out after %d sec", now-m_until);
+      break;
+    }
     usleep(SLEEP_NANOS);
-  } while (time(nullptr) < m_until);
+  } while (true);
   return -1;  // timeout
 }
 
 ssize_t SSLSocket::recv(char* data, size_t len) {
+  time_t now = 0;
   do {
 #if OPENSSL_VERSION_NUMBER >= 0x10101000L
     size_t part = 0;
@@ -124,14 +130,18 @@ ssize_t SSLSocket::recv(char* data, size_t len) {
       return static_cast<ssize_t>(res);
     }
 #endif
-    if (!BIO_should_retry(m_bio)) {
+    if (!BIO_should_retry(m_bio) && now > 0) {  // always repeat on first failure
       if (isError("recv", true)) {
         return -1;
       }
       return 0;
     }
+    if ((now=time(nullptr)) > m_until) {
+      logError(lf_network, "HTTP recv: timed out after %d sec", now-m_until);
+      break;
+    }
     usleep(SLEEP_NANOS);
-  } while (time(nullptr) < m_until);
+  } while (true);
   return -1;  // timeout
 }