mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-02 10:37:49 +03:00
curl: add patch for the HTTP/2 issue
See upstream issue https://github.com/curl/curl/issues/10525
This commit is contained in:
parent
5c852cc587
commit
74f6aaae4a
62
pkgs/tools/networking/curl/7.88.0-http2-breakage.patch
Normal file
62
pkgs/tools/networking/curl/7.88.0-http2-breakage.patch
Normal file
@ -0,0 +1,62 @@
|
||||
From 3103de2053ca8cacf9cdbe78764ba6814481709f Mon Sep 17 00:00:00 2001
|
||||
Date: Wed, 15 Feb 2023 22:11:13 +0100
|
||||
Subject: [PATCH] http2: buffer/pausedata and output flush fix.
|
||||
|
||||
* do not process pending input data when copying pausedata to the
|
||||
caller
|
||||
* return CURLE_AGAIN if the output buffer could not be completely
|
||||
written out.
|
||||
|
||||
Ref: #10525
|
||||
Closes #10529
|
||||
---
|
||||
lib/http2.c | 15 +++------------
|
||||
1 file changed, 3 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/lib/http2.c b/lib/http2.c
|
||||
index 46fc746457726..1ef5d3949218f 100644
|
||||
--- a/lib/http2.c
|
||||
+++ b/lib/http2.c
|
||||
@@ -467,6 +467,7 @@ static CURLcode flush_output(struct Curl_cfilter *cf,
|
||||
}
|
||||
if((size_t)written < buflen) {
|
||||
Curl_dyn_tail(&ctx->outbuf, buflen - (size_t)written);
|
||||
+ return CURLE_AGAIN;
|
||||
}
|
||||
else {
|
||||
Curl_dyn_reset(&ctx->outbuf);
|
||||
@@ -1790,6 +1791,7 @@ static ssize_t cf_h2_recv(struct Curl_cfilter *cf, struct Curl_easy *data,
|
||||
|
||||
stream->pausedata += nread;
|
||||
stream->pauselen -= nread;
|
||||
+ drain_this(cf, data);
|
||||
|
||||
if(stream->pauselen == 0) {
|
||||
DEBUGF(LOG_CF(data, cf, "[h2sid=%u] Unpaused", stream->stream_id));
|
||||
@@ -1798,18 +1800,6 @@ static ssize_t cf_h2_recv(struct Curl_cfilter *cf, struct Curl_easy *data,
|
||||
|
||||
stream->pausedata = NULL;
|
||||
stream->pauselen = 0;
|
||||
-
|
||||
- /* When NGHTTP2_ERR_PAUSE is returned from
|
||||
- data_source_read_callback, we might not process DATA frame
|
||||
- fully. Calling nghttp2_session_mem_recv() again will
|
||||
- continue to process DATA frame, but if there is no incoming
|
||||
- frames, then we have to call it again with 0-length data.
|
||||
- Without this, on_stream_close callback will not be called,
|
||||
- and stream could be hanged. */
|
||||
- if(h2_process_pending_input(cf, data, err) != 0) {
|
||||
- nread = -1;
|
||||
- goto out;
|
||||
- }
|
||||
}
|
||||
DEBUGF(LOG_CF(data, cf, "[h2sid=%u] recv: returns unpaused %zd bytes",
|
||||
stream->stream_id, nread));
|
||||
@@ -1933,6 +1923,7 @@ static ssize_t cf_h2_recv(struct Curl_cfilter *cf, struct Curl_easy *data,
|
||||
drained_transfer(cf, data);
|
||||
}
|
||||
|
||||
+ *err = CURLE_OK;
|
||||
nread = retlen;
|
||||
DEBUGF(LOG_CF(data, cf, "[h2sid=%u] cf_h2_recv -> %zd",
|
||||
stream->stream_id, nread));
|
@ -60,6 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
patches = [
|
||||
./7.79.1-darwin-no-systemconfiguration.patch
|
||||
./7.88.0-http2-breakage.patch
|
||||
];
|
||||
|
||||
outputs = [ "bin" "dev" "out" "man" "devdoc" ];
|
||||
|
Loading…
Reference in New Issue
Block a user