diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2016-08-02 00:48:23 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2016-08-04 00:23:27 +0200 |
| commit | 6eb60c2dc589a15ff8a3aa5961745d86044a9b78 (patch) | |
| tree | 8d0df4b11585a8b02b60e9e2d042158461c3fa53 /lib/transfer.h | |
| parent | 497e7c9d3460566712b3cd81b272cde7826f264c (diff) | |
| download | curl-6eb60c2dc589a15ff8a3aa5961745d86044a9b78.tar.gz | |
transfer: return without select when the read loop reached maxcount
Regression added in 790d6de48515. The was then added to avoid one
particular transfer to starve out others. But when aborting due to
reading the maxcount, the connection must be marked to be read from
again without first doing a select as for some protocols (like SFTP/SCP)
the data may already have been read off the socket.
Reported-by: Dan Donahue
Bug: https://curl.haxx.se/mail/lib-2016-07/0057.html
Diffstat (limited to 'lib/transfer.h')
| -rw-r--r-- | lib/transfer.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/transfer.h b/lib/transfer.h index 0e253e373..0058f8c86 100644 --- a/lib/transfer.h +++ b/lib/transfer.h @@ -40,10 +40,9 @@ typedef enum { CURLcode Curl_follow(struct Curl_easy *data, char *newurl, followtype type); - - CURLcode Curl_readwrite(struct connectdata *conn, - struct Curl_easy *data, bool *done); + struct Curl_easy *data, bool *done, + bool *comeback); int Curl_single_getsock(const struct connectdata *conn, curl_socket_t *socks, int numsocks); |