From e963209266bbf3809cb8b44740de1b61e58f9ace Mon Sep 17 00:00:00 2001
From: dartraiden <wowemuh@gmail.com>
Date: Sat, 2 May 2020 22:10:12 +0300
Subject: libcurl: update to 7.70.0

---
 libs/libcurl/src/socks.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'libs/libcurl/src/socks.c')

diff --git a/libs/libcurl/src/socks.c b/libs/libcurl/src/socks.c
index 37099130e5..18affbc964 100644
--- a/libs/libcurl/src/socks.c
+++ b/libs/libcurl/src/socks.c
@@ -62,13 +62,15 @@ int Curl_blockread_all(struct connectdata *conn, /* connection data */
   int result;
   *n = 0;
   for(;;) {
-    timediff_t timeleft = Curl_timeleft(conn->data, NULL, TRUE);
-    if(timeleft < 0) {
+    timediff_t timeout_ms = Curl_timeleft(conn->data, NULL, TRUE);
+    if(timeout_ms < 0) {
       /* we already got the timeout */
       result = CURLE_OPERATION_TIMEDOUT;
       break;
     }
-    if(SOCKET_READABLE(sockfd, timeleft) <= 0) {
+    if(!timeout_ms)
+      timeout_ms = TIME_T_MAX;
+    if(SOCKET_READABLE(sockfd, timeout_ms) <= 0) {
       result = ~CURLE_OK;
       break;
     }
-- 
cgit v1.2.3