diff options
| author | dartraiden <wowemuh@gmail.com> | 2020-08-20 16:00:06 +0300 |
|---|---|---|
| committer | dartraiden <wowemuh@gmail.com> | 2020-08-20 16:00:06 +0300 |
| commit | e5193f7cfc63bed18795b195a1b86a959638a5bf (patch) | |
| tree | 556aaab722ebcdbd63c89d2ccabca5144c1537e2 /libs/libcurl/src/url.c | |
| parent | fb9c38570dbdb83d3c53b01f12326a97f7ba16e3 (diff) | |
libcurl: update to 7.72.0
Diffstat (limited to 'libs/libcurl/src/url.c')
| -rw-r--r-- | libs/libcurl/src/url.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libs/libcurl/src/url.c b/libs/libcurl/src/url.c index a1a6b69103..150667aa97 100644 --- a/libs/libcurl/src/url.c +++ b/libs/libcurl/src/url.c @@ -630,7 +630,7 @@ CURLcode Curl_open(struct Curl_easy **curl) Curl_initinfo(data); /* most recent connection is not yet defined */ - data->state.lastconnect = NULL; + data->state.lastconnect_id = -1; data->progress.flags |= PGRS_HIDE; data->state.current_speed = -1; /* init to negative == impossible */ @@ -1836,11 +1836,12 @@ static CURLcode parseurlandfillconn(struct Curl_easy *data, CURLU *uh; CURLUcode uc; char *hostname; + bool use_set_uh = (data->set.uh && !data->state.this_is_a_follow); up_free(data); /* cleanup previous leftovers first */ /* parse the URL */ - if(data->set.uh) { + if(use_set_uh) { uh = data->state.uh = curl_url_dup(data->set.uh); } else { @@ -1863,7 +1864,7 @@ static CURLcode parseurlandfillconn(struct Curl_easy *data, data->change.url_alloc = TRUE; } - if(!data->set.uh) { + if(!use_set_uh) { char *newurl; uc = curl_url_set(uh, CURLUPART_URL, data->change.url, CURLU_GUESS_SCHEME | @@ -3170,7 +3171,7 @@ static CURLcode resolve_server(struct Curl_easy *data, else { /* this is a fresh connect */ int rc; - struct Curl_dns_entry *hostaddr; + struct Curl_dns_entry *hostaddr = NULL; #ifdef USE_UNIX_SOCKETS if(conn->unix_domain_socket) { |