summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2020-03-06 10:04:28 +0100
committerDaniel Stenberg <daniel@haxx.se>2020-03-07 10:49:51 +0100
commite040146f22608fd92c44be2447a6505141a8a867 (patch)
tree4d084aa00bb40dd4b2f540295073f23bcc4e8c57
parent4b786abc434d9802229d08d625acbf8cbb9d326f (diff)
downloadcurl-e040146f22608fd92c44be2447a6505141a8a867.tar.gz
pause: force a connection (re-)check after unpausing
There might be data available that was already read off the socket, for example in the TLS layer. Reported-by: Anders Berg Fixes #4966 Closes #5049
-rw-r--r--lib/easy.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/easy.c b/lib/easy.c
index 33bc1aab7..f7a6d5c60 100644
--- a/lib/easy.c
+++ b/lib/easy.c
@@ -1047,6 +1047,10 @@ CURLcode curl_easy_pause(struct Curl_easy *data, int action)
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->multi)
Curl_update_timer(data->multi);
}