59 lines
1.9 KiB
Diff
59 lines
1.9 KiB
Diff
From 2c706c44b98998fa619ddc63b2c14955b0f50692 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Stenberg <daniel@haxx.se>
|
|
Date: Thu, 5 Mar 2020 23:45:36 +0100
|
|
Subject: [PATCH] Revert "pause: force-drain the transfer on unpause"
|
|
|
|
This reverts commit fa0216b294af4c7113a9040ca65eefc7fc18ac1c (from #5000)
|
|
|
|
Clearly that didn't solve the problem correctly.
|
|
|
|
Reported-by: Christopher Reid
|
|
Reopens #4966
|
|
Fixes #5044
|
|
|
|
Upstream-commit: 8aa04e9a24932b830bc5eaf6838dea5a3329341e
|
|
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
|
---
|
|
lib/easy.c | 1 -
|
|
lib/transfer.c | 5 ++---
|
|
2 files changed, 2 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/lib/easy.c b/lib/easy.c
|
|
index 1a69127..4546210 100644
|
|
--- a/lib/easy.c
|
|
+++ b/lib/easy.c
|
|
@@ -1033,7 +1033,6 @@ CURLcode curl_easy_pause(struct Curl_easy *data, int action)
|
|
to have this handle checked soon */
|
|
if((newstate & (KEEP_RECV_PAUSE|KEEP_SEND_PAUSE)) !=
|
|
(KEEP_RECV_PAUSE|KEEP_SEND_PAUSE)) {
|
|
- data->state.drain++;
|
|
Curl_expire(data, 0, EXPIRE_RUN_NOW); /* get this handle going again */
|
|
if(data->multi)
|
|
Curl_update_timer(data->multi);
|
|
diff --git a/lib/transfer.c b/lib/transfer.c
|
|
index 8270761..ead8b36 100644
|
|
--- a/lib/transfer.c
|
|
+++ b/lib/transfer.c
|
|
@@ -5,7 +5,7 @@
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
- * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
+ * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
*
|
|
* This software is licensed as described in the file COPYING, which
|
|
* you should have received as part of this distribution. The terms
|
|
@@ -1217,8 +1217,7 @@ CURLcode Curl_readwrite(struct connectdata *conn,
|
|
else
|
|
fd_write = CURL_SOCKET_BAD;
|
|
|
|
- if(data->state.drain) {
|
|
- data->state.drain--;
|
|
+ if(conn->data->state.drain) {
|
|
select_res |= CURL_CSELECT_IN;
|
|
DEBUGF(infof(data, "Curl_readwrite: forcibly told to drain data\n"));
|
|
}
|
|
--
|
|
2.21.1
|
|
|