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

http2: when uploading data from stdin, fix eos forwarding

Browse source 
When uploading data from stdin ('-T -'), and the EOS was only detected
on a 0-length read, the EOS was not forwarded to the filters. This led
HTTP/2 to hang on not forwarding this to the server.

Added test_07_14 to reproduce and verify.

Fixes #14870
Reported-by: nekopsykose on github
Closes #14877
This commit is contained in:
Stefan Eissing 2024-09-12 10:03:33 +02:00 • committed by Daniel Stenberg
parent 9dc0770e2c
commit 70d3a9b6aa
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
5 changed files with 68 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

35
lib/request.c
View file

@ -214,15 +214,19 @@ static CURLcode xfer_send(struct Curl_easy *data,
eos = TRUE;
}
result = Curl_xfer_send(data, buf, blen, eos, pnwritten);
if(!result && *pnwritten) {
if(hds_len)
Curl_debug(data, CURLINFO_HEADER_OUT, (char *)buf,
CURLMIN(hds_len, *pnwritten));
if(*pnwritten > hds_len) {
size_t body_len = *pnwritten - hds_len;
Curl_debug(data, CURLINFO_DATA_OUT, (char *)buf + hds_len, body_len);
data->req.writebytecount += body_len;
Curl_pgrsSetUploadCounter(data, data->req.writebytecount);
if(!result) {
if(eos && (blen == *pnwritten))
data->req.eos_sent = TRUE;
if(*pnwritten) {
if(hds_len)
Curl_debug(data, CURLINFO_HEADER_OUT, (char *)buf,
CURLMIN(hds_len, *pnwritten));
if(*pnwritten > hds_len) {
size_t body_len = *pnwritten - hds_len;
Curl_debug(data, CURLINFO_DATA_OUT, (char *)buf + hds_len, body_len);
data->req.writebytecount += body_len;
Curl_pgrsSetUploadCounter(data, data->req.writebytecount);
}
}
}
return result;
@ -304,8 +308,17 @@ static CURLcode req_flush(struct Curl_easy *data)
return Curl_xfer_flush(data);
}
if(!data->req.upload_done && data->req.eos_read &&
Curl_bufq_is_empty(&data->req.sendbuf)) {
if(data->req.eos_read && !data->req.eos_sent) {
char tmp;
size_t nwritten;
result = xfer_send(data, &tmp, 0, 0, &nwritten);
if(result)
return result;
DEBUGASSERT(data->req.eos_sent);
}
if(!data->req.upload_done && data->req.eos_read && data->req.eos_sent) {
DEBUGASSERT(Curl_bufq_is_empty(&data->req.sendbuf));
if(data->req.shutdown) {
bool done;
result = Curl_xfer_send_shutdown(data, &done);