aboutsummaryrefslogtreecommitdiff
path: root/lib/socks.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/socks.c')
-rw-r--r--lib/socks.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/socks.c b/lib/socks.c
index 5dd83631c..dfd944ef3 100644
--- a/lib/socks.c
+++ b/lib/socks.c
@@ -62,15 +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(timeleft > TIME_T_MAX)
- timeleft = TIME_T_MAX;
- if(SOCKET_READABLE(sockfd, (time_t)timeleft) <= 0) {
+ if(!timeout_ms || timeout_ms > TIME_T_MAX)
+ timeout_ms = TIME_T_MAX;
+ if(SOCKET_READABLE(sockfd, (time_t)timeout_ms) <= 0) {
result = ~CURLE_OK;
break;
}