romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-06-01 22:14:17 +03:00
Code Issues Projects Releases Packages Wiki Activity

multi: fix polling with pending input

Browse source 
When multi creates the pollset of a transfer, it checks now if
a connection (FIRST/SECONDARY) socket waits on POLLIN and has input data
pending in filters (relevant to OpenSSL's new read ahead). If so, it
triggers a timeout on the transfer via EXPIRE_RUN_NOW.

This fixes sporadic stalls in test 988 when running event based.

Closes #17636
This commit is contained in:
Stefan Eissing 2025-06-16 12:19:52 +02:00 • committed by Viktor Szakats
parent 739c09c8a4
commit 62349e45a8
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
3 changed files with 32 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/multi.c
View file

@ -1038,6 +1038,18 @@ void Curl_multi_getsock(struct Curl_easy *data,
break;
}
/* 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))) {
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);
}
switch(ps->num) {
case 0:
CURL_TRC_M(data, "%s pollset[], timeouts=%zu, paused %d/%d (r/w)",