From 491e026ccda0e60975fa6e2e9cf3ccca37e18f7b Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Mon, 11 Mar 2013 16:57:25 +0100 Subject: easy: do not ignore poll() failures other than EINTR --- lib/easy.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/easy.c b/lib/easy.c index c27deffda..2e747bb28 100644 --- a/lib/easy.c +++ b/lib/easy.c @@ -441,11 +441,19 @@ CURLcode curl_easy_perform(CURL *easy) while(!done && !mcode) { int still_running; + int ret; - mcode = curl_multi_wait(multi, NULL, 0, 1000, NULL); + mcode = curl_multi_wait(multi, NULL, 0, 1000, &ret); + + if(mcode == CURLM_OK) { + if(ret == -1) { + /* poll() failed not on EINTR, indicate a network problem */ + code = CURLE_RECV_ERROR; + break; + } - if(mcode == CURLM_OK) mcode = curl_multi_perform(multi, &still_running); + } /* only read 'still_running' if curl_multi_perform() return OK */ if((mcode == CURLM_OK) && !still_running) { -- cgit v1.2.3