We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent 85c0108 commit 4b7fd2cCopy full SHA for 4b7fd2c
src/cargo/util/network/http.rs
@@ -62,12 +62,7 @@ pub fn configure_http_handle(gctx: &GlobalContext, handle: &mut Easy) -> CargoRe
62
handle.cainfo(&cainfo)?;
63
}
64
// Use `proxy_cainfo` if explicitly set; otherwise, fall back to `cainfo` as curl does #15376.
65
- let effective_proxy_cainfo = match (&http.proxy_cainfo, &http.cainfo) {
66
- (Some(p), _) => Some(p),
67
- (None, Some(ca)) => Some(ca),
68
- _ => None,
69
- };
70
- if let Some(proxy_cainfo) = effective_proxy_cainfo {
+ if let Some(proxy_cainfo) = http.proxy_cainfo.as_ref().or(http.cainfo.as_ref()) {
71
let proxy_cainfo = proxy_cainfo.resolve_path(gctx);
72
handle.proxy_cainfo(&format!("{}", proxy_cainfo.display()))?;
73
0 commit comments