moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-24 00:58:48 -05:00
Code Issues Releases Wiki Activity

url: make sure pushed streams get an allocated download buffer

Browse Source 
Follow-up to c4e6968127

When a new transfer is created, as a resuly of an acknowledged push,
that transfer needs a download buffer allocated.

Closes #5590
This commit is contained in:
Daniel Stenberg 2020-06-23 14:02:54 +02:00
parent abbc5d6044
commit ff1c37cbe3
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/multi.c
View File

@ -1642,10 +1642,11 @@ static CURLcode protocol_connect(struct connectdata *conn,
} }
/* /*
* preconnect() is called immediately before a connect starts. When a redirect * Curl_preconnect() is called immediately before a connect starts. When a
* is followed, this is then called multiple times during a single transfer. * redirect is followed, this is then called multiple times during a single
* transfer.
*/ */
static CURLcode preconnect(struct Curl_easy *data) CURLcode Curl_preconnect(struct Curl_easy *data)
{ {
if(!data->state.buffer) { if(!data->state.buffer) {
data->state.buffer = malloc(data->set.buffer_size + 1); data->state.buffer = malloc(data->set.buffer_size + 1);
@ -1763,7 +1764,7 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi,
case CURLM_STATE_CONNECT: case CURLM_STATE_CONNECT:
/* Connect. We want to get a connection identifier filled in. */ /* Connect. We want to get a connection identifier filled in. */
/* init this transfer. */ /* init this transfer. */
result = preconnect(data); result = Curl_preconnect(data);
if(result) if(result)
break; break;

1
lib/multiif.h
View File

@ -37,6 +37,7 @@ void Curl_detach_connnection(struct Curl_easy *data);
bool Curl_multiplex_wanted(const struct Curl_multi *multi); bool Curl_multiplex_wanted(const struct Curl_multi *multi);
void Curl_set_in_callback(struct Curl_easy *data, bool value); void Curl_set_in_callback(struct Curl_easy *data, bool value);
bool Curl_is_in_callback(struct Curl_easy *easy); bool Curl_is_in_callback(struct Curl_easy *easy);
CURLcode Curl_preconnect(struct Curl_easy *data);
/* Internal version of curl_multi_init() accepts size parameters for the /* Internal version of curl_multi_init() accepts size parameters for the
socket and connection hashes */ socket and connection hashes */

5
lib/url.c
View File

@ -3981,6 +3981,11 @@ CURLcode Curl_init_do(struct Curl_easy *data, struct connectdata *conn)
{ {
struct SingleRequest *k = &data->req; struct SingleRequest *k = &data->req;
/* if this is a pushed stream, we need this: */
CURLcode result = Curl_preconnect(data);
if(result)
return result;
if(conn) { if(conn) {
conn->bits.do_more = FALSE; /* by default there's no curl_do_more() to conn->bits.do_more = FALSE; /* by default there's no curl_do_more() to
use */ use */