diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2020-03-05 23:45:36 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2020-03-05 23:45:41 +0100 |
| commit | 8aa04e9a24932b830bc5eaf6838dea5a3329341e (patch) | |
| tree | 836ec01cc0ad75e5e158cf980217ea00b9ac8cf9 | |
| parent | 32a28dc28d54c73d9db2424763c45da7696dc0ac (diff) | |
| download | curl-8aa04e9a24932b830bc5eaf6838dea5a3329341e.tar.gz | |
Revert "pause: force-drain the transfer on unpause"bagder/revert-unpause-h2
This reverts commit fa0216b294af4c7113a9040ca65eefc7fc18ac1c (from #5000)
Clearly that didn't solve the problem correctly.
Reported-by: Christopher Reid
Reopens #4966
Fixes #5044
| -rw-r--r-- | lib/easy.c | 1 | ||||
| -rw-r--r-- | lib/transfer.c | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/lib/easy.c b/lib/easy.c index 1a6912748..454621076 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 827076183..ead8b36db 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")); } |