diff options
author | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2021-12-26 18:25:45 +0300 |
---|---|---|
committer | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2021-12-26 18:25:45 +0300 |
commit | cf42e7fd4c56aeb97eb552a79edc6a40f3ba1580 (patch) | |
tree | 3bfb724ed6892898c0434da179402a0e54ed7881 | |
parent | b800cc1ec295f401a448b43f952bb27ef102d15d (diff) | |
download | libmicrohttpd-cf42e7fd4c56aeb97eb552a79edc6a40f3ba1580.tar.gz libmicrohttpd-cf42e7fd4c56aeb97eb552a79edc6a40f3ba1580.zip |
test_large_put: compatibility with old libcurl
Compatibility was broken by 5ce0c23e37470b4e61ee431236b55bfc5d5744a9
-rw-r--r-- | src/testcurl/test_large_put.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/testcurl/test_large_put.c b/src/testcurl/test_large_put.c index 0ccd97b4..ff9b4eb3 100644 --- a/src/testcurl/test_large_put.c +++ b/src/testcurl/test_large_put.c | |||
@@ -715,8 +715,13 @@ testPutExternal (void) | |||
715 | FD_ZERO (&rs); | 715 | FD_ZERO (&rs); |
716 | FD_ZERO (&ws); | 716 | FD_ZERO (&ws); |
717 | FD_ZERO (&es); | 717 | FD_ZERO (&es); |
718 | if (CURLM_OK != curl_multi_perform (multi, &running)) | 718 | mret = curl_multi_perform (multi, &running); |
719 | libcurlErrorExitDesc ("curl_multi_perform() failed"); | 719 | if ((CURLM_OK != mret) && (CURLM_CALL_MULTI_PERFORM != mret)) |
720 | { | ||
721 | fprintf (stderr, "curl_multi_perform() failed. Error: '%s'. ", | ||
722 | curl_multi_strerror (mret)); | ||
723 | libcurlErrorExit (); | ||
724 | } | ||
720 | if (CURLM_OK != curl_multi_fdset (multi, &rs, &ws, &es, &maxcurlsock)) | 725 | if (CURLM_OK != curl_multi_fdset (multi, &rs, &ws, &es, &maxcurlsock)) |
721 | libcurlErrorExitDesc ("curl_multi_fdset() failed"); | 726 | libcurlErrorExitDesc ("curl_multi_fdset() failed"); |
722 | if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &maxMHDsock)) | 727 | if (MHD_YES != MHD_get_fdset (d, &rs, &ws, &es, &maxMHDsock)) |
@@ -741,8 +746,13 @@ testPutExternal (void) | |||
741 | #endif | 746 | #endif |
742 | } | 747 | } |
743 | 748 | ||
744 | if (CURLM_OK != curl_multi_perform (multi, &running)) | 749 | mret = curl_multi_perform (multi, &running); |
745 | libcurlErrorExitDesc ("curl_multi_perform() failed"); | 750 | if ((CURLM_OK != mret) && (CURLM_CALL_MULTI_PERFORM != mret)) |
751 | { | ||
752 | fprintf (stderr, "curl_multi_perform() failed. Error: '%s'. ", | ||
753 | curl_multi_strerror (mret)); | ||
754 | libcurlErrorExit (); | ||
755 | } | ||
746 | if (0 == running) | 756 | if (0 == running) |
747 | { | 757 | { |
748 | int pending; | 758 | int pending; |