curl: Update to 7.79.1
This commit is contained in:
parent
a0caf95aa8
commit
2e733e8a85
@ -1,47 +0,0 @@
|
|||||||
From 901804ef95777b8e735a55b77f8dd630a58c575b Mon Sep 17 00:00:00 2001
|
|
||||||
From: Daniel Stenberg <daniel@haxx.se>
|
|
||||||
Date: Thu, 16 Sep 2021 08:50:54 +0200
|
|
||||||
Subject: [PATCH] Curl_http2_setup: don't change connection data on repeat
|
|
||||||
invokes
|
|
||||||
|
|
||||||
Regression from 3cb8a748670ab88c (releasde in 7.79.0). That change moved
|
|
||||||
transfer oriented inits to before the check but also erroneously moved a
|
|
||||||
few connection oriented ones, which causes problems.
|
|
||||||
|
|
||||||
Reported-by: Evangelos Foutras
|
|
||||||
Fixes #7730
|
|
||||||
Closes #7731
|
|
||||||
---
|
|
||||||
lib/http2.c | 12 ++++++------
|
|
||||||
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/lib/http2.c b/lib/http2.c
|
|
||||||
index a3de607c7d24..6d63f43636a5 100644
|
|
||||||
--- a/lib/http2.c
|
|
||||||
+++ b/lib/http2.c
|
|
||||||
@@ -2221,12 +2221,6 @@ CURLcode Curl_http2_setup(struct Curl_easy *data,
|
|
||||||
stream->mem = data->state.buffer;
|
|
||||||
stream->len = data->set.buffer_size;
|
|
||||||
|
|
||||||
- httpc->inbuflen = 0;
|
|
||||||
- httpc->nread_inbuf = 0;
|
|
||||||
-
|
|
||||||
- httpc->pause_stream_id = 0;
|
|
||||||
- httpc->drain_total = 0;
|
|
||||||
-
|
|
||||||
multi_connchanged(data->multi);
|
|
||||||
/* below this point only connection related inits are done, which only needs
|
|
||||||
to be done once per connection */
|
|
||||||
@@ -2252,6 +2246,12 @@ CURLcode Curl_http2_setup(struct Curl_easy *data,
|
|
||||||
conn->httpversion = 20;
|
|
||||||
conn->bundle->multiuse = BUNDLE_MULTIPLEX;
|
|
||||||
|
|
||||||
+ httpc->inbuflen = 0;
|
|
||||||
+ httpc->nread_inbuf = 0;
|
|
||||||
+
|
|
||||||
+ httpc->pause_stream_id = 0;
|
|
||||||
+ httpc->drain_total = 0;
|
|
||||||
+
|
|
||||||
infof(data, "Connection state changed (HTTP/2 confirmed)");
|
|
||||||
|
|
||||||
return CURLE_OK;
|
|
||||||
@ -2,8 +2,8 @@
|
|||||||
|
|
||||||
pkgbase=curl
|
pkgbase=curl
|
||||||
pkgname=('curl' 'libcurl' 'libcurl-devel')
|
pkgname=('curl' 'libcurl' 'libcurl-devel')
|
||||||
pkgver=7.79.0
|
pkgver=7.79.1
|
||||||
pkgrel=2
|
pkgrel=1
|
||||||
pkgdesc="Multi-protocol file transfer utility"
|
pkgdesc="Multi-protocol file transfer utility"
|
||||||
arch=('i686' 'x86_64')
|
arch=('i686' 'x86_64')
|
||||||
url="https://curl.haxx.se"
|
url="https://curl.haxx.se"
|
||||||
@ -16,15 +16,13 @@ source=("https://github.com/curl/curl/releases/download/${pkgbase}-${pkgver//./_
|
|||||||
curl-7.55.1-msys2.patch
|
curl-7.55.1-msys2.patch
|
||||||
curl-7.58.0-libpsl-static-libs.patch
|
curl-7.58.0-libpsl-static-libs.patch
|
||||||
curl-7.60.0-gssapi-static-libs.patch
|
curl-7.60.0-gssapi-static-libs.patch
|
||||||
0001-more-static-fixes.patch
|
0001-more-static-fixes.patch)
|
||||||
0001-Curl_http2_setup-do-not-change-connection-data-on-repeat-invokes.patch)
|
sha256sums=('0606f74b1182ab732a17c11613cbbaf7084f2e6cca432642d0e3ad7c224c3689'
|
||||||
sha256sums=('2a1420076f9ffc35c982c78e85b7a69e2ef5d532267895fdb2eac16ad9b680c9'
|
|
||||||
'SKIP'
|
'SKIP'
|
||||||
'e5ba067afcfd726403cf7e6cb2349ff3fe6fe093c2853a4196a8f57f9f56d8d6'
|
'e5ba067afcfd726403cf7e6cb2349ff3fe6fe093c2853a4196a8f57f9f56d8d6'
|
||||||
'ad3d76013c2dd683c44ad4cdc5108ea5218056c87b66f6ed2a90502e785a39af'
|
'ad3d76013c2dd683c44ad4cdc5108ea5218056c87b66f6ed2a90502e785a39af'
|
||||||
'd58a94556c031e550403ed13691305983bf83493f15fb8c35615e59bf265bbf7'
|
'd58a94556c031e550403ed13691305983bf83493f15fb8c35615e59bf265bbf7'
|
||||||
'870a91d09480cd0d1dc74119376350fc430e5223e2d4b3c0606af17793ecc310'
|
'870a91d09480cd0d1dc74119376350fc430e5223e2d4b3c0606af17793ecc310')
|
||||||
'3992f218b2722af5aa448b9c603cbc94b743fade18d884e99f5f1d62d54d2a4b')
|
|
||||||
validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2' # Daniel Stenberg
|
validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2' # Daniel Stenberg
|
||||||
'914C533DF9B2ADA2204F586D78E11C6B279D5C91') # Daniel Stenberg (old key)
|
'914C533DF9B2ADA2204F586D78E11C6B279D5C91') # Daniel Stenberg (old key)
|
||||||
|
|
||||||
@ -37,9 +35,6 @@ prepare() {
|
|||||||
# https://github.com/curl/curl/discussions/6324
|
# https://github.com/curl/curl/discussions/6324
|
||||||
patch -p1 -i ${srcdir}/0001-more-static-fixes.patch
|
patch -p1 -i ${srcdir}/0001-more-static-fixes.patch
|
||||||
|
|
||||||
# https://github.com/curl/curl/issues/7730
|
|
||||||
patch -p1 -i ${srcdir}/0001-Curl_http2_setup-do-not-change-connection-data-on-repeat-invokes.patch
|
|
||||||
|
|
||||||
autoreconf -fiv
|
autoreconf -fiv
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user