romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-25 06:53:31 +03:00
Code Issues Projects Releases Packages Wiki Activity

dict: avoid busy-loop in sendf() when the socket is not writable

Browse source 
Curl_xfer_send() reports CURLE_AGAIN as a successful zero-byte send, so
the retry loop spun at 100% CPU and ignored the timeout when the peer
stopped draining. Wait for writability and check the remaining time
between retries.

Closes #22576
This commit is contained in:
Thomas Chauchefoin 2026-08-13 17:27:57 +02:00 • committed by Daniel Stenberg
parent 82b289c952
commit 68b5e60138
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
1 changed files with 28 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

28
lib/dict.c
View file

@ -55,6 +55,8 @@
#include "transfer.h"
#include "curl_trc.h"
#include "connect.h"
#include "select.h"
#include "escape.h"
#define DICT_MATCH "/MATCH:"
@ -93,9 +95,12 @@ static CURLcode sendf(struct Curl_easy *data,
static CURLcode sendf(struct Curl_easy *data, const char *fmt, ...)
{
curl_socket_t sockfd = data->conn->sock[FIRSTSOCKET];
size_t bytes_written;
size_t write_len;
CURLcode result = CURLE_OK;
timediff_t timeout_ms;
int what;
char *s;
char *sptr;
va_list ap;
@ -126,6 +131,29 @@ static CURLcode sendf(struct Curl_easy *data, const char *fmt, ...)
}
else
break;
timeout_ms = Curl_timeleft_ms(data);
if(timeout_ms < 0) {
result = CURLE_OPERATION_TIMEDOUT;
break;
}
if(!timeout_ms)
timeout_ms = TIMEDIFF_T_MAX;
/* Do not busyloop. The entire loop thing is a workaround as it causes a
BLOCKING behavior which is a NO-NO. This function should rather be
split up in a do and a doing piece where the pieces that are not
possible to send now will be sent in the doing function repeatedly
until the entire request is sent. */
what = SOCKET_WRITABLE(sockfd, timeout_ms);
if(what < 0) {
result = CURLE_SEND_ERROR;
break;
}
else if(!what) {
result = CURLE_OPERATION_TIMEDOUT;
break;
}
}
curlx_free(s); /* free the output string */