romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-09 08:17:15 +03:00
Code Issues Projects Releases Packages Wiki Activity

multi: do no expire a blocked transfer

Browse source 
When checking to expire a transfer with input data pending, also assess
the blocked status and do not EXPIRE_RUN_NOW a transfer that is blocked
on READ/WRITE.

Follow-up to 62349e45a8 #17636

Closes #17639
This commit is contained in:
Stefan Eissing 2025-06-16 13:40:15 +02:00 • committed by Viktor Szakats
parent 1454aa17d6
commit 6270b41f92
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/multi.c
View file

@ -1039,12 +1039,13 @@ void Curl_multi_getsock(struct Curl_easy *data,
}
/* Waiting to receive with buffered input.
/* Unblocked and waiting to receive with buffered input.
* Make transfer run again at next opportunity. */
if((Curl_pollset_want_read(data, ps, data->conn->sock[FIRSTSOCKET]) &&
Curl_conn_data_pending(data, FIRSTSOCKET)) ||
(Curl_pollset_want_read(data, ps, data->conn->sock[SECONDARYSOCKET]) &&
Curl_conn_data_pending(data, SECONDARYSOCKET))) {
if(!Curl_xfer_is_blocked(data) &&
((Curl_pollset_want_read(data, ps, data->conn->sock[FIRSTSOCKET]) &&
Curl_conn_data_pending(data, FIRSTSOCKET)) ||
(Curl_pollset_want_read(data, ps, data->conn->sock[SECONDARYSOCKET]) &&
Curl_conn_data_pending(data, SECONDARYSOCKET)))) {
CURL_TRC_M(data, "%s pollset[] has POLLIN, but there is still "
"buffered input to consume -> EXPIRE_RUN_NOW", caller);
Curl_expire(data, 0, EXPIRE_RUN_NOW);