From c771968ab6e842ecda4043a6e8d553457543816e Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 7 Aug 2012 23:30:05 +0200 Subject: Curl_socket_check: fix timeout return value for select users This is the same fix applied for the conditional code that uses select() that was already done for the poll specific code in commit b61e8b81f5038. --- lib/select.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/select.c b/lib/select.c index 4196211c0..32b6fa55f 100644 --- a/lib/select.c +++ b/lib/select.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2012, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -306,8 +306,10 @@ int Curl_socket_check(curl_socket_t readfd0, /* two sockets to read from */ break; if(timeout_ms > 0) { pending_ms = timeout_ms - elapsed_ms; - if(pending_ms <= 0) + if(pending_ms <= 0) { + r = 0; /* Simulate a "call timed out" case */ break; + } } } while(r == -1); -- cgit v1.2.3