diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2020-05-28 18:30:47 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2020-05-30 23:14:33 +0200 |
| commit | c4e6968127e876b01e5e0b4b7cdbc49d5267530c (patch) | |
| tree | 7d74ba1d30f99ac91b050fbb6c5b44338c56e88f /lib/multi.c | |
| parent | 842f73de58f38bd6e285e08bbd1adb6c17cb62cd (diff) | |
url: alloc the download buffer at transfer start
... and free it as soon as the transfer is done. It removes the extra
alloc when a new size is set with setopt() and reduces memory for unused
easy handles.
In addition: the closure_handle now doesn't use an allocated buffer at
all but the smallest supported size as a stack based one.
Closes #5472
Diffstat (limited to 'lib/multi.c')
| -rw-r--r-- | lib/multi.c | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/lib/multi.c b/lib/multi.c index 75b0357c3..b753b1a61 100644 --- a/lib/multi.c +++ b/lib/multi.c @@ -678,6 +678,7 @@ static CURLcode multi_done(struct Curl_easy *data, data->state.lastconnect = NULL; } + Curl_safefree(data->state.buffer); Curl_free_request_state(data); return result; } @@ -1522,6 +1523,20 @@ static CURLcode protocol_connect(struct connectdata *conn, return result; /* pass back status */ } +/* + * preconnect() is called immediately before a connect starts. When a redirect + * is followed, this is then called multiple times during a single transfer. + */ +static CURLcode preconnect(struct Curl_easy *data) +{ + if(!data->state.buffer) { + data->state.buffer = malloc(data->set.buffer_size + 1); + if(!data->state.buffer) + return CURLE_OUT_OF_MEMORY; + } + return CURLE_OK; +} + static CURLMcode multi_runsingle(struct Curl_multi *multi, struct curltime now, @@ -1629,6 +1644,11 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi, case CURLM_STATE_CONNECT: /* Connect. We want to get a connection identifier filled in. */ + /* init this transfer. */ + result = preconnect(data); + if(result) + break; + Curl_pgrsTime(data, TIMER_STARTSINGLE); if(data->set.timeout) Curl_expire(data, data->set.timeout, EXPIRE_TIMEOUT); @@ -2058,7 +2078,7 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi, char *newurl = NULL; bool retry = FALSE; bool comeback = FALSE; - + DEBUGASSERT(data->state.buffer); /* check if over send speed */ send_timeout_ms = 0; if(data->set.max_send_speed > 0) |