diff options
| -rw-r--r-- | RELEASE-NOTES | 1 | ||||
| -rw-r--r-- | lib/easy.c | 12 |
2 files changed, 11 insertions, 2 deletions
diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 3594c627a..b41a56655 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -53,6 +53,7 @@ This release includes the following bugfixes: o docs: updates HTML index and general improvements o curlbuild.h.dist: enhance non-configure GCC ABI detection logic o sasl: Fixed null pointer reference when decoding empty digest challenge [8] + o easy: do not ignore poll() failures other than EINTR This release includes the following known bugs: 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) { |