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

transfer: fix sendrecv() without interim poll

Browse Source 
There was a "clever" optimization that skipped sendrecv() handling when
the transfer's pollset was empty. This happens for paused transfers, for
example.

Unforunately, if the libcurl application never calls curl_multi_poll(),
the pollset is and will aways remain empty, prevent the transfer from
progressing.

Remove this "optimization" and always try send/receive where applicable.

Fixes #14898
Reported-by: Victor Kislov
Closes #14901
This commit is contained in:
Stefan Eissing 2024-09-13 18:36:53 +02:00 committed by Daniel Stenberg
parent 8972845123
commit a33bcc9b53
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/transfer.c
View File

@ -431,8 +431,6 @@ CURLcode Curl_sendrecv(struct Curl_easy *data, struct curltime *nowp)
if(select_bits_paused(data, data->state.select_bits)) { if(select_bits_paused(data, data->state.select_bits)) {
/* leave the bits unchanged, so they'll tell us what to do when /* leave the bits unchanged, so they'll tell us what to do when
* this transfer gets unpaused. */ * this transfer gets unpaused. */
/* DEBUGF(infof(data, "sendrecv, select_bits, early return on PAUSED"));
*/
result = CURLE_OK; result = CURLE_OK;
goto out; goto out;
} }
@ -440,16 +438,13 @@ CURLcode Curl_sendrecv(struct Curl_easy *data, struct curltime *nowp)
/* DEBUGF(infof(data, "sendrecv, select_bits %x, RUN", select_bits)); */ /* DEBUGF(infof(data, "sendrecv, select_bits %x, RUN", select_bits)); */
select_bits = (CURL_CSELECT_OUT|CURL_CSELECT_IN); select_bits = (CURL_CSELECT_OUT|CURL_CSELECT_IN);
} }
else if(data->last_poll.num) { else {
/* The transfer wanted something polled. Let's run all available /* try both directions if the transfer wants it. We used to poll
* send/receives. Worst case we EAGAIN on some. */ * the socket here and on ran send/recv depending on POLLIN/OUT, but
/* DEBUGF(infof(data, "sendrecv, had poll sockets, RUN")); */ * that does not when connections are multiplexed or handshake,
* or other direction reversals are happening. */
select_bits = (CURL_CSELECT_OUT|CURL_CSELECT_IN); select_bits = (CURL_CSELECT_OUT|CURL_CSELECT_IN);
} }
else if(data->req.keepon & KEEP_SEND_TIMED) {
/* DEBUGF(infof(data, "sendrecv, KEEP_SEND_TIMED, RUN ul")); */
select_bits = CURL_CSELECT_OUT;
}
#ifdef USE_HYPER #ifdef USE_HYPER
if(data->conn->datastream) { if(data->conn->datastream) {