romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-04-14 23:51:42 +03:00
Code Issues Projects Releases Packages Wiki Activity

urldata: byebye conn->hostname_resolve

Browse source 
The strdup() of the hostname to resolve is unnecessary as the sync
resolve code does not keep the string and the async code makes copies
already.

Remove the member from `connectdata`.

Closes #20833
This commit is contained in:
Stefan Eissing 2026-03-06 11:09:29 +01:00 • committed by Daniel Stenberg
parent 9a3afc1083
commit bfb79de206
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
2 changed files with 1 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/url.c
View file

@ -545,7 +545,6 @@ void Curl_conn_free(struct Curl_easy *data, struct connectdata *conn)
Curl_safefree(conn->oauth_bearer);
Curl_safefree(conn->host.rawalloc); /* hostname buffer */
Curl_safefree(conn->conn_to_host.rawalloc); /* hostname buffer */
Curl_safefree(conn->hostname_resolve);
Curl_safefree(conn->secondaryhostname);
Curl_safefree(conn->localdev);
Curl_ssl_conn_config_cleanup(conn);
@ -3146,12 +3145,7 @@ static CURLcode resolve_server(struct Curl_easy *data,
eport = conn->bits.conn_to_port ? conn->conn_to_port : conn->remote_port;
}
/* Resolve target host right on */
conn->hostname_resolve = curlx_strdup(ehost->name);
if(!conn->hostname_resolve)
return CURLE_OUT_OF_MEMORY;
result = Curl_resolv_timeout(data, conn->hostname_resolve,
result = Curl_resolv_timeout(data, ehost->name,
eport, conn->ip_version,
pdns, timeout_ms);
DEBUGASSERT(!result || !*pdns);
@ -3237,9 +3231,6 @@ static void url_conn_reuse_adjust(struct Curl_easy *data,
conn->conn_to_port = needle->conn_to_port;
conn->remote_port = needle->remote_port;
curlx_free(conn->hostname_resolve);
conn->hostname_resolve = needle->hostname_resolve;
needle->hostname_resolve = NULL;
}
static void conn_meta_freeentry(void *p)

1
lib/urldata.h
View file

@ -617,7 +617,6 @@ struct connectdata {
struct Curl_hash meta_hash;
struct hostname host;
char *hostname_resolve; /* hostname to resolve to address, allocated */
char *secondaryhostname; /* secondary socket hostname (ftp) */
struct hostname conn_to_host; /* the host to connect to. valid only if
bits.conn_to_host is set */