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

ngtcp2: stabilize recv

Browse source 
When receiving on a stream that already failed or has already been closed,
return the matching error code without touching the connection. In case
the connection shows errors, e.g. the server closed, those errors should
not have impact on an already failed/closed stream.

This might mitigate flakiness in pytest 07_13 where unexpected errors
occur after a successful upload.

Closes #20220
This commit is contained in:
Stefan Eissing 2026-01-08 11:19:39 +01:00 • committed by Daniel Stenberg
parent e3691612ea
commit f2d008811d
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
1 changed files with 22 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

35
lib/vquic/curl_ngtcp2.c
View file

@ -1396,6 +1396,7 @@ static CURLcode cf_ngtcp2_recv(struct Curl_cfilter *cf, struct Curl_easy *data,
struct cf_call_data save; struct cf_call_data save;
struct pkt_io_ctx pktx; struct pkt_io_ctx pktx;
CURLcode result = CURLE_OK; CURLcode result = CURLE_OK;
int i;
(void)ctx; (void)ctx;
(void)buf; (void)buf;
@ -1422,21 +1423,29 @@ static CURLcode cf_ngtcp2_recv(struct Curl_cfilter *cf, struct Curl_easy *data,
cf_ngtcp2_ack_stream(cf, data, stream); cf_ngtcp2_ack_stream(cf, data, stream);
if(cf_progress_ingress(cf, data, &pktx)) { /* first check for results/closed already known without touching
result = CURLE_RECV_ERROR; * the connection. For an already failed/closed stream, errors on
goto out; * the connection do not count.
* Then handle incoming data and check for failed/closed again.
*/
for(i = 0; i < 2; ++i) {
if(stream->xfer_result) {
CURL_TRC_CF(data, cf, "[%" PRId64 "] xfer write failed", stream->id);
cf_ngtcp2_stream_close(cf, data, stream);
result = stream->xfer_result;
goto out;
}
else if(stream->closed) {
result = recv_closed_stream(cf, data, stream, pnread);
goto out;
}
if(!i && cf_progress_ingress(cf, data, &pktx)) {
result = CURLE_RECV_ERROR;
goto out;
}
} }
if(stream->xfer_result) {
CURL_TRC_CF(data, cf, "[%" PRId64 "] xfer write failed", stream->id);
cf_ngtcp2_stream_close(cf, data, stream);
result = stream->xfer_result;
goto out;
}
else if(stream->closed) {
result = recv_closed_stream(cf, data, stream, pnread);
goto out;
}
result = CURLE_AGAIN; result = CURLE_AGAIN;
out: out: