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

cfilter: re-add conn as parameter to cfilter setup methods

Browse source 
- `Curl_ssl_get_config()` now returns the first config if no SSL proxy
  filter is active

- socket filter starts connection only on first invocation of its
  connect method

Fixes #9982
Closes #9983
This commit is contained in:
Stefan Eissing 2022-11-26 12:43:56 +01:00 • committed by Daniel Stenberg
parent 3e33681eaf
commit f18956d0ca
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
16 changed files with 68 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/http_proxy.c
View file

@ -1191,6 +1191,7 @@ static const struct Curl_cftype cft_http_proxy = {
};
CURLcode Curl_conn_http_proxy_add(struct Curl_easy *data,
struct connectdata *conn,
int sockindex)
{
struct Curl_cfilter *cf;
@ -1198,7 +1199,7 @@ CURLcode Curl_conn_http_proxy_add(struct Curl_easy *data,
result = Curl_cf_create(&cf, &cft_http_proxy, NULL);
if(!result)
Curl_conn_cf_add(data, sockindex, cf);
Curl_conn_cf_add(data, conn, sockindex, cf);
return result;
}
@ -1275,6 +1276,7 @@ static const struct Curl_cftype cft_haproxy = {
};
CURLcode Curl_conn_haproxy_add(struct Curl_easy *data,
struct connectdata *conn,
int sockindex)
{
struct Curl_cfilter *cf;
@ -1282,7 +1284,7 @@ CURLcode Curl_conn_haproxy_add(struct Curl_easy *data,
result = Curl_cf_create(&cf, &cft_haproxy, NULL);
if(!result)
Curl_conn_cf_add(data, sockindex, cf);
Curl_conn_cf_add(data, conn, sockindex, cf);
return result;
}