diff options
| author | Stefan Eissing <stefan@eissing.org> | 2023-02-08 15:56:57 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2023-02-09 08:38:01 +0100 |
| commit | 8c762f59983a3e9e2b80fdb34aa5e08f1d9a1c7d (patch) | |
| tree | fd7f4fa5ac0d65ae973addd7a79d8e1163ea71be /lib/http2.c | |
| parent | cace68e2999a7b007774f78eb2084aec937fb633 (diff) | |
| download | curl-8c762f59983a3e9e2b80fdb34aa5e08f1d9a1c7d.tar.gz | |
http2: minor buffer and error path fixes
- use memory buffer in full available size
- fail receive of reset/errored streams early
pytest:
- make test_05 error cases more reliable
Closes #10444
Diffstat (limited to 'lib/http2.c')
| -rw-r--r-- | lib/http2.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/lib/http2.c b/lib/http2.c index 778b58841..d5eed385e 100644 --- a/lib/http2.c +++ b/lib/http2.c @@ -1905,8 +1905,9 @@ static ssize_t cf_h2_recv(struct Curl_cfilter *cf, struct Curl_easy *data, if(stream->memlen) { ssize_t retlen = stream->memlen; - DEBUGF(LOG_CF(data, cf, "[h2sid=%u] recv: returns %zd", - stream->stream_id, retlen)); + + /* TODO: all this buffer handling is very brittle */ + stream->len += stream->memlen; stream->memlen = 0; if(ctx->pause_stream_id == stream->stream_id) { @@ -1918,6 +1919,10 @@ static ssize_t cf_h2_recv(struct Curl_cfilter *cf, struct Curl_easy *data, Curl_expire(data, 0, EXPIRE_RUN_NOW); } else if(stream->closed) { + if(stream->reset || stream->error) { + nread = http2_handle_stream_close(cf, data, stream, err); + goto out; + } /* this stream is closed, trigger a another read ASAP to detect that */ DEBUGF(LOG_CF(data, cf, "[h2sid=%u] is closed now, run again", stream->stream_id)); @@ -1928,11 +1933,15 @@ static ssize_t cf_h2_recv(struct Curl_cfilter *cf, struct Curl_easy *data, drained_transfer(cf, data); nread = retlen; + DEBUGF(LOG_CF(data, cf, "[h2sid=%u] cf_h2_recv -> %zd", + stream->stream_id, nread)); goto out; } - if(stream->closed) - return http2_handle_stream_close(cf, data, stream, err); + if(stream->closed) { + nread = http2_handle_stream_close(cf, data, stream, err); + goto out; + } if(!data->state.drain && Curl_conn_cf_data_pending(cf->next, data)) { DEBUGF(LOG_CF(data, cf, "[h2sid=%u] pending data, set drain", |