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/multi.c | |
| parent | 497e7c9d3460566712b3cd81b272cde7826f264c (diff) | |
| download | gnurl-6eb60c2dc589a15ff8a3aa5961745d86044a9b78.tar.gz gnurl-6eb60c2dc589a15ff8a3aa5961745d86044a9b78.tar.bz2 gnurl-6eb60c2dc589a15ff8a3aa5961745d86044a9b78.zip | |
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/multi.c')
| -rw-r--r-- | lib/multi.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/multi.c b/lib/multi.c index 8bb93660d..c471c48d9 100644 --- a/lib/multi.c +++ b/lib/multi.c @@ -1810,6 +1810,7 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi, { char *newurl = NULL; bool retry = FALSE; + bool comeback = FALSE; /* check if over send speed */ if((data->set.max_send_speed > 0) && @@ -1844,7 +1845,7 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi, } /* read/write data if it is ready to do so */ - result = Curl_readwrite(data->easy_conn, data, &done); + result = Curl_readwrite(data->easy_conn, data, &done, &comeback); k = &data->req; @@ -1950,6 +1951,8 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi, rc = CURLM_CALL_MULTI_PERFORM; } } + else if(comeback) + rc = CURLM_CALL_MULTI_PERFORM; free(newurl); break; |