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

lib: reduce use of data->conn->

Browse source 
If there are more than two of them in a function, use a local 'conn'
variable instead.

Closes #19063
This commit is contained in:
Daniel Stenberg 2025-10-14 17:40:18 +02:00
parent 9441127394
commit ae5fb4188d
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
6 changed files with 62 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

23
lib/http.c
View file

@ -1977,6 +1977,9 @@ static CURLcode http_target(struct Curl_easy *data,
CURLcode result = CURLE_OK;
const char *path = data->state.up.path;
const char *query = data->state.up.query;
#ifndef CURL_DISABLE_PROXY
struct connectdata *conn = data->conn;
#endif
if(data->set.str[STRING_TARGET]) {
path = data->set.str[STRING_TARGET];
@ -1984,7 +1987,7 @@ static CURLcode http_target(struct Curl_easy *data,
}
#ifndef CURL_DISABLE_PROXY
if(data->conn->bits.httpproxy && !data->conn->bits.tunnel_proxy) {
if(conn->bits.httpproxy && !conn->bits.tunnel_proxy) {
/* Using a proxy but does not tunnel through it */
/* The path sent to the proxy is in fact the entire URL. But if the remote
@ -1998,8 +2001,8 @@ static CURLcode http_target(struct Curl_easy *data,
if(!h)
return CURLE_OUT_OF_MEMORY;
if(data->conn->host.dispname != data->conn->host.name) {
uc = curl_url_set(h, CURLUPART_HOST, data->conn->host.name, 0);
if(conn->host.dispname != conn->host.name) {
uc = curl_url_set(h, CURLUPART_HOST, conn->host.name, 0);
if(uc) {
curl_url_cleanup(h);
return CURLE_OUT_OF_MEMORY;
@ -2746,6 +2749,7 @@ static CURLcode http_add_hd(struct Curl_easy *data,
Curl_HttpReq httpreq)
{
CURLcode result = CURLE_OK;
struct connectdata *conn = data->conn;
switch(id) {
case H1_HD_REQUEST:
/* add the main request stuff */
@ -2818,8 +2822,8 @@ static CURLcode http_add_hd(struct Curl_easy *data,
#ifndef CURL_DISABLE_PROXY
case H1_HD_PROXY_CONNECTION:
if(data->conn->bits.httpproxy &&
!data->conn->bits.tunnel_proxy &&
if(conn->bits.httpproxy &&
!conn->bits.tunnel_proxy &&
!Curl_checkheaders(data, STRCONST("Proxy-Connection")) &&
!Curl_checkProxyheaders(data, data->conn, STRCONST("Proxy-Connection")))
result = curlx_dyn_add(req, "Proxy-Connection: Keep-Alive\r\n");
@ -2832,11 +2836,10 @@ static CURLcode http_add_hd(struct Curl_easy *data,
#ifndef CURL_DISABLE_ALTSVC
case H1_HD_ALT_USED:
if(data->conn->bits.altused &&
!Curl_checkheaders(data, STRCONST("Alt-Used")))
if(conn->bits.altused && !Curl_checkheaders(data, STRCONST("Alt-Used")))
result = curlx_dyn_addf(req, "Alt-Used: %s:%d\r\n",
data->conn->conn_to_host.name,
data->conn->conn_to_port);
conn->conn_to_host.name,
conn->conn_to_port);
break;
#endif
@ -2849,7 +2852,7 @@ static CURLcode http_add_hd(struct Curl_easy *data,
result = Curl_http2_request_upgrade(req, data);
}
#ifndef CURL_DISABLE_WEBSOCKETS
if(!result && data->conn->handler->protocol&(CURLPROTO_WS|CURLPROTO_WSS))
if(!result && conn->handler->protocol&(CURLPROTO_WS|CURLPROTO_WSS))
result = Curl_ws_request(data, req);
#endif
break;