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

test556: improve robustness

Browse Source 
Fix handling of partial/blocked sends.

Fixes test with CURL_DBG_SOCK_WBLOCK=90 set.

Closes #14453
This commit is contained in:
Stefan Eissing 2024-08-08 13:23:32 +02:00 committed by Daniel Stenberg
parent 32f9130ae1
commit ac6349b451
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
tests/libtest/lib556.c
View File

@ -65,28 +65,35 @@ CURLcode test(char *URL)
const char *request = const char *request =
"GET /556 HTTP/1.1\r\n" "GET /556 HTTP/1.1\r\n"
"Host: ninja\r\n\r\n"; "Host: ninja\r\n\r\n";
size_t iolen = 0; const char *sbuf = request;
size_t sblen = strlen(request);
res = curl_easy_send(curl, request, strlen(request), &iolen); size_t nwritten = 0, nread = 0;
if(!res) {
/* we assume that sending always work */
do { do {
char buf[1024]; char buf[1024];
/* busy-read like crazy */
res = curl_easy_recv(curl, buf, sizeof(buf), &iolen);
if(iolen) { if(sblen) {
res = curl_easy_send(curl, sbuf, sblen, &nwritten);
if(res && res != CURLE_AGAIN)
break;
if(nwritten > 0) {
sbuf += nwritten;
sblen -= nwritten;
}
}
/* busy-read like crazy */
res = curl_easy_recv(curl, buf, sizeof(buf), &nread);
if(nread) {
/* send received stuff to stdout */ /* send received stuff to stdout */
if(!write(STDOUT_FILENO, buf, iolen)) if(!write(STDOUT_FILENO, buf, nread))
break; break;
} }
} while((res == CURLE_OK && iolen) || (res == CURLE_AGAIN)); } while((res == CURLE_OK && nread) || (res == CURLE_AGAIN));
}
if(iolen) if(res && res != CURLE_AGAIN)
res = TEST_ERR_FAILURE; res = TEST_ERR_FAILURE;
} }