1 |
akien |
1884616 |
--- rustc-1.63.0-src/Cargo.lock.orig 2022-08-10 12:25:16.512185135 -0700 |
2 |
|
|
+++ rustc-1.63.0-src/Cargo.lock 2022-08-10 12:25:16.513185114 -0700 |
3 |
|
|
@@ -1054,7 +1054,6 @@ |
4 |
akien |
1789601 |
dependencies = [ |
5 |
|
|
"cc", |
6 |
|
|
"libc", |
7 |
|
|
- "libnghttp2-sys", |
8 |
|
|
"libz-sys", |
9 |
|
|
"openssl-sys", |
10 |
|
|
"pkg-config", |
11 |
akien |
1884616 |
@@ -2160,16 +2159,6 @@ |
12 |
akien |
1789601 |
checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a" |
13 |
|
|
|
14 |
|
|
[[package]] |
15 |
|
|
-name = "libnghttp2-sys" |
16 |
|
|
-version = "0.1.4+1.41.0" |
17 |
|
|
-source = "registry+https://github.com/rust-lang/crates.io-index" |
18 |
|
|
-checksum = "03624ec6df166e79e139a2310ca213283d6b3c30810c54844f307086d4488df1" |
19 |
|
|
-dependencies = [ |
20 |
|
|
- "cc", |
21 |
|
|
- "libc", |
22 |
|
|
-] |
23 |
|
|
- |
24 |
|
|
-[[package]] |
25 |
|
|
name = "libz-sys" |
26 |
|
|
version = "1.1.3" |
27 |
|
|
source = "registry+https://github.com/rust-lang/crates.io-index" |
28 |
akien |
1884616 |
--- rustc-1.63.0-src/src/tools/cargo/Cargo.toml.orig 2022-08-10 12:25:16.514185093 -0700 |
29 |
|
|
+++ rustc-1.63.0-src/src/tools/cargo/Cargo.toml 2022-08-10 12:25:51.441455282 -0700 |
30 |
akien |
1789601 |
@@ -22,7 +22,7 @@ |
31 |
akien |
1884616 |
cargo-util = { path = "crates/cargo-util", version = "0.2.1" } |
32 |
akien |
1848765 |
crates-io = { path = "crates/crates-io", version = "0.34.0" } |
33 |
akien |
1789601 |
crossbeam-utils = "0.8" |
34 |
akien |
1884616 |
-curl = { version = "0.4.43", features = ["http2"] } |
35 |
|
|
+curl = { version = "0.4.43", features = [] } |
36 |
|
|
curl-sys = "0.4.55" |
37 |
akien |
1789601 |
env_logger = "0.9.0" |
38 |
|
|
pretty_env_logger = { version = "0.4", optional = true } |
39 |
akien |
1884616 |
--- rustc-1.63.0-src/src/tools/cargo/src/cargo/sources/registry/http_remote.rs.orig 2022-08-08 15:47:35.000000000 -0700 |
40 |
|
|
+++ rustc-1.63.0-src/src/tools/cargo/src/cargo/sources/registry/http_remote.rs 2022-08-10 12:25:16.514185093 -0700 |
41 |
|
|
@@ -192,16 +192,8 @@ |
42 |
akien |
1883518 |
} |
43 |
|
|
self.fetch_started = true; |
44 |
|
|
|
45 |
|
|
- // We've enabled the `http2` feature of `curl` in Cargo, so treat |
46 |
|
|
- // failures here as fatal as it would indicate a build-time problem. |
47 |
|
|
- self.multiplexing = self.config.http_config()?.multiplexing.unwrap_or(true); |
48 |
|
|
- |
49 |
|
|
- self.multi |
50 |
|
|
- .pipelining(false, self.multiplexing) |
51 |
|
|
- .with_context(|| "failed to enable multiplexing/pipelining in curl")?; |
52 |
|
|
- |
53 |
|
|
- // let's not flood the server with connections |
54 |
|
|
- self.multi.set_max_host_connections(2)?; |
55 |
|
|
+ // Multiplexing is disabled because the system libcurl doesn't support it. |
56 |
|
|
+ self.multiplexing = false; |
57 |
|
|
|
58 |
|
|
self.config |
59 |
|
|
.shell() |
60 |
akien |
1884616 |
--- rustc-1.63.0-src/src/tools/cargo/src/cargo/core/package.rs.orig 2022-08-08 15:47:35.000000000 -0700 |
61 |
|
|
+++ rustc-1.63.0-src/src/tools/cargo/src/cargo/core/package.rs 2022-08-10 12:25:16.514185093 -0700 |
62 |
akien |
1883518 |
@@ -403,16 +403,9 @@ |
63 |
|
|
sources: SourceMap<'cfg>, |
64 |
|
|
config: &'cfg Config, |
65 |
|
|
) -> CargoResult<PackageSet<'cfg>> { |
66 |
|
|
- // We've enabled the `http2` feature of `curl` in Cargo, so treat |
67 |
|
|
- // failures here as fatal as it would indicate a build-time problem. |
68 |
akien |
1789601 |
- let mut multi = Multi::new(); |
69 |
|
|
- let multiplexing = config.http_config()?.multiplexing.unwrap_or(true); |
70 |
|
|
- multi |
71 |
|
|
- .pipelining(false, multiplexing) |
72 |
|
|
- .with_context(|| "failed to enable multiplexing/pipelining in curl")?; |
73 |
|
|
- |
74 |
|
|
- // let's not flood crates.io with connections |
75 |
|
|
- multi.set_max_host_connections(2)?; |
76 |
akien |
1883518 |
+ // Multiplexing is disabled because the system libcurl doesn't support it. |
77 |
akien |
1789601 |
+ let multi = Multi::new(); |
78 |
|
|
+ let multiplexing = false; |
79 |
|
|
|
80 |
|
|
Ok(PackageSet { |
81 |
|
|
packages: package_ids |
82 |
akien |
1883518 |
@@ -658,7 +651,7 @@ |
83 |
akien |
1789601 |
macro_rules! try_old_curl { |
84 |
|
|
($e:expr, $msg:expr) => { |
85 |
|
|
let result = $e; |
86 |
|
|
- if cfg!(target_os = "macos") { |
87 |
|
|
+ if cfg!(any(target_os = "linux", target_os = "macos")) { |
88 |
|
|
if let Err(e) = result { |
89 |
|
|
warn!("ignoring libcurl {} error: {}", $msg, e); |
90 |
|
|
} |