luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test677: improve robustness

Browse Source 
Do not treat CURLE_AGAIN as error.

Fixes test with CURL_DBG_SOCK_WBLOCK=90 set.

Closes #14455
This commit is contained in:
Stefan Eissing 2024-08-08 13:29:12 +02:00 committed by Daniel Stenberg
parent 640febc7d0
commit f27ba323ad
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/libtest/lib677.c
View File

@ -75,7 +75,7 @@ CURLcode test(char *URL)
curl_easy_getinfo(curl, CURLINFO_ACTIVESOCKET, &sock);
waitfd.fd = sock;
}
curl_multi_wait(mcurl, &waitfd, sock == CURL_SOCKET_BAD ? 0 : 1, 500,
curl_multi_wait(mcurl, &waitfd, sock == CURL_SOCKET_BAD ? 0 : 1, 50,
&mrun);
if((sock != CURL_SOCKET_BAD) && (waitfd.revents & waitfd.events)) {
size_t len = 0;
@ -83,7 +83,10 @@ CURLcode test(char *URL)
if(!state) {
CURLcode ec;
ec = curl_easy_send(curl, cmd + pos, sizeof(cmd) - 1 - pos, &len);
if(ec != CURLE_OK) {
if(ec == CURLE_AGAIN) {
continue;
}
else if(ec) {
fprintf(stderr, "curl_easy_send() failed, with code %d (%s)\n",
(int)ec, curl_easy_strerror(ec));
res = ec;
@ -101,7 +104,10 @@ CURLcode test(char *URL)
else if(pos < (ssize_t)sizeof(buf)) {
CURLcode ec;
ec = curl_easy_recv(curl, buf + pos, sizeof(buf) - pos, &len);
if(ec != CURLE_OK) {
if(ec == CURLE_AGAIN) {
continue;
}
else if(ec) {
fprintf(stderr, "curl_easy_recv() failed, with code %d (%s)\n",
(int)ec, curl_easy_strerror(ec));
res = ec;