git-market/curl-curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-04-11 12:01:42 +08:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity

url: do not reuse a non-tls starttls connection if new requires TLS

Browse Source 
Reported-by: Arkadi Vainbrand

Closes #21082
This commit is contained in:
Daniel Stenberg 2026-03-24 08:35:08 +01:00
parent 62d77b12fc
commit 507e7be573
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/url.c
View File

@ -723,7 +723,7 @@ struct url_conn_match {
BIT(want_proxy_ntlm_http);
BIT(want_nego_http);
BIT(want_proxy_nego_http);
BIT(req_tls); /* require TLS use from a clear-text start */
BIT(wait_pipe);
BIT(force_reuse);
BIT(seen_pending_conn);
@ -875,6 +875,9 @@ static bool url_match_ssl_use(struct connectdata *conn,
(get_protocol_family(conn->scheme) != m->needle->scheme->protocol))
return FALSE;
}
else if(m->req_tls)
/* a clear-text STARTTLS protocol with required TLS */
return FALSE;
return TRUE;
}
@ -1333,6 +1336,7 @@ static bool url_attach_existing(struct Curl_easy *data,
(needle->scheme->protocol & PROTO_FAMILY_HTTP);
#endif
#endif
match.req_tls = data->set.use_ssl >= CURLUSESSL_CONTROL;
/* Find a connection in the pool that matches what "data + needle"
* requires. If a suitable candidate is found, it is attached to "data". */