summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2020-09-25 11:17:07 +0200
committerDaniel Stenberg <daniel@haxx.se>2020-09-25 11:17:07 +0200
commit4d813d4257b1ae983368262dcfa7e53dc6e03f83 (patch)
tree66017f40c8cfc4ead2df95f5d1959a4d1051f8ac
parentc04223caaf06a8a7c452dba24f0a9ef0ad7f9981 (diff)
downloadcurl-bagder/unpause-reread.tar.gz
Revert "fixup to instead check the updated keepon bits"bagder/unpause-reread
This reverts commit c04223caaf06a8a7c452dba24f0a9ef0ad7f9981. CHUK-ANDREW in issue #5988 reported the updated take didn't work
-rw-r--r--lib/easy.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/lib/easy.c b/lib/easy.c
index 51c5e2cbc..60e2befd7 100644
--- a/lib/easy.c
+++ b/lib/easy.c
@@ -1062,16 +1062,15 @@ CURLcode curl_easy_pause(struct Curl_easy *data, int action)
}
/* if there's no error and we're not pausing both directions, we want
- to have this handle checked soon
- NOTE: 'k->keepon' might have gotten updated in the client_write call
- above */
- if((k->keepon & (KEEP_RECV_PAUSE|KEEP_SEND_PAUSE)) !=
+ to have this handle checked soon */
+ if((newstate & (KEEP_RECV_PAUSE|KEEP_SEND_PAUSE)) !=
(KEEP_RECV_PAUSE|KEEP_SEND_PAUSE)) {
Curl_expire(data, 0, EXPIRE_RUN_NOW); /* get this handle going again */
- /* force a recv/send check of this connection, as the data might've been
- read off the socket already */
- data->conn->cselect_bits = CURL_CSELECT_IN | CURL_CSELECT_OUT;
+ if(!data->state.tempcount)
+ /* if not pausing again, force a recv/send check of this connection as
+ the data might've been read off the socket already */
+ data->conn->cselect_bits = CURL_CSELECT_IN | CURL_CSELECT_OUT;
if(data->multi)
Curl_update_timer(data->multi);
}