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

urldata: move cookiehost to struct SingleRequest

Browse source 
To make it scoped for the single request appropriately.

Reported-by: Muhamad Arga Reksapati

Verify with libtest 2504: a custom Host *disabled* on reused handle

Closes #21312
This commit is contained in:
Daniel Stenberg 2026-04-14 08:51:44 +02:00
parent 86f1e5b3f6
commit 3a19987a87
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
9 changed files with 162 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/http.c
View file

@ -2046,6 +2046,9 @@ static CURLcode http_set_aptr_host(struct Curl_easy *data)
data->state.first_remote_protocol = conn->scheme->protocol;
}
curlx_safefree(aptr->host);
#ifndef CURL_DISABLE_COOKIES
curlx_safefree(data->req.cookiehost);
#endif
ptr = Curl_checkheaders(data, STRCONST("Host"));
if(ptr && (!data->state.this_is_a_follow ||
@ -2081,8 +2084,7 @@ static CURLcode http_set_aptr_host(struct Curl_easy *data)
if(colon)
*colon = 0; /* The host must not include an embedded port number */
}
curlx_free(aptr->cookiehost);
aptr->cookiehost = cookiehost;
data->req.cookiehost = cookiehost;
}
#endif
@ -2577,8 +2579,8 @@ static CURLcode http_cookies(struct Curl_easy *data,
if(data->cookies && data->state.cookie_engine) {
bool okay;
const char *host = data->state.aptr.cookiehost ?
data->state.aptr.cookiehost : data->conn->host.name;
const char *host = data->req.cookiehost ?
data->req.cookiehost : data->conn->host.name;
Curl_share_lock(data, CURL_LOCK_DATA_COOKIE, CURL_LOCK_ACCESS_SINGLE);
result = Curl_cookie_getlist(data, data->conn, &okay, host, &list);
if(!result && okay) {
@ -3578,8 +3580,8 @@ static CURLcode http_header_s(struct Curl_easy *data,
if(v) {
/* If there is a custom-set Host: name, use it here, or else use
* real peer hostname. */
const char *host = data->state.aptr.cookiehost ?
data->state.aptr.cookiehost : conn->host.name;
const char *host = data->req.cookiehost ?
data->req.cookiehost : conn->host.name;
const bool secure_context = Curl_secure_context(conn, host);
CURLcode result;
Curl_share_lock(data, CURL_LOCK_DATA_COOKIE, CURL_LOCK_ACCESS_SINGLE);

3
lib/request.c
View file

@ -118,6 +118,9 @@ void Curl_req_hard_reset(struct SingleRequest *req, struct Curl_easy *data)
curlx_safefree(req->userpwd);
#ifndef CURL_DISABLE_PROXY
curlx_safefree(req->proxyuserpwd);
#endif
#ifndef CURL_DISABLE_COOKIES
curlx_safefree(req->cookiehost);
#endif
Curl_client_reset(data);
if(req->sendbuf_init)

3
lib/request.h
View file

@ -118,6 +118,9 @@ struct SingleRequest {
#ifndef CURL_DISABLE_PROXY
char *proxyuserpwd; /* proxy auth header */
#endif
#ifndef CURL_DISABLE_COOKIES
char *cookiehost;
#endif
#ifndef CURL_DISABLE_COOKIES
unsigned char setcookies;
#endif

2
lib/url.c
View file

@ -290,7 +290,7 @@ CURLcode Curl_close(struct Curl_easy **datap)
curlx_safefree(data->state.aptr.ref);
curlx_safefree(data->state.aptr.host);
#ifndef CURL_DISABLE_COOKIES
curlx_safefree(data->state.aptr.cookiehost);
curlx_safefree(data->req.cookiehost);
#endif
#ifndef CURL_DISABLE_RTSP
curlx_safefree(data->state.aptr.rtsp_transport);

3
lib/urldata.h
View file

@ -804,9 +804,6 @@ struct UrlState {
char *rangeline;
char *ref;
char *host;
#ifndef CURL_DISABLE_COOKIES
char *cookiehost;
#endif
#ifndef CURL_DISABLE_RTSP
char *rtsp_transport;
#endif