romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-26 21:03:34 +03:00
Code Issues Projects Releases Packages Wiki Activity

lib: move request specific allocations to the request struct

Browse source 
To make it clearer that they are ephemeral.

Closes #21301
This commit is contained in:
Daniel Stenberg 2026-04-13 19:38:16 +02:00
parent 7a349b5eed
commit 3512b673dd
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
13 changed files with 37 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

20
lib/http.c
View file

@ -256,7 +256,7 @@ static CURLcode http_output_basic(struct Curl_easy *data, bool proxy)
connection */
if(proxy) {
#ifndef CURL_DISABLE_PROXY
userp = &data->state.aptr.proxyuserpwd;
userp = &data->req.proxyuserpwd;
user = data->state.aptr.proxyuser;
pwd = data->state.aptr.proxypasswd;
#else
@ -264,7 +264,7 @@ static CURLcode http_output_basic(struct Curl_easy *data, bool proxy)
#endif
}
else {
userp = &data->state.aptr.userpwd;
userp = &data->req.userpwd;
user = data->state.aptr.user;
pwd = data->state.aptr.passwd;
}
@ -312,7 +312,7 @@ static CURLcode http_output_bearer(struct Curl_easy *data)
char **userp;
CURLcode result = CURLE_OK;
userp = &data->state.aptr.userpwd;
userp = &data->req.userpwd;
curlx_free(*userp);
*userp = curl_maprintf("Authorization: Bearer %s\r\n",
data->set.str[STRING_BEARER]);
@ -2904,14 +2904,14 @@ static CURLcode http_add_hd(struct Curl_easy *data,
#ifndef CURL_DISABLE_PROXY
case H1_HD_PROXY_AUTH:
if(data->state.aptr.proxyuserpwd)
result = curlx_dyn_add(req, data->state.aptr.proxyuserpwd);
if(data->req.proxyuserpwd)
result = curlx_dyn_add(req, data->req.proxyuserpwd);
break;
#endif
case H1_HD_USER_AUTH:
if(data->state.aptr.userpwd)
result = curlx_dyn_add(req, data->state.aptr.userpwd);
if(data->req.userpwd)
result = curlx_dyn_add(req, data->req.userpwd);
break;
case H1_HD_RANGE:
@ -3122,12 +3122,6 @@ out:
if(result == CURLE_TOO_LARGE)
failf(data, "HTTP request too large");
/* clear userpwd and proxyuserpwd to avoid reusing old credentials
* from reused connections */
curlx_safefree(data->state.aptr.userpwd);
#ifndef CURL_DISABLE_PROXY
curlx_safefree(data->state.aptr.proxyuserpwd);
#endif
curlx_dyn_free(&req);
return result;
}