| 1 |
--- rustc-beta-src/Cargo.lock.orig 2022-06-22 14:03:26.309745526 -0700 |
| 2 |
+++ rustc-beta-src/Cargo.lock 2022-06-22 14:03:26.310745506 -0700 |
| 3 |
@@ -990,7 +990,6 @@ |
| 4 |
dependencies = [ |
| 5 |
"cc", |
| 6 |
"libc", |
| 7 |
- "libnghttp2-sys", |
| 8 |
"libz-sys", |
| 9 |
"openssl-sys", |
| 10 |
"pkg-config", |
| 11 |
@@ -2101,16 +2100,6 @@ |
| 12 |
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 |
--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig 2022-06-22 14:03:26.310745506 -0700 |
| 29 |
+++ rustc-beta-src/src/tools/cargo/Cargo.toml 2022-06-22 14:04:22.058596881 -0700 |
| 30 |
@@ -22,7 +22,7 @@ |
| 31 |
cargo-util = { path = "crates/cargo-util", version = "0.1.3" } |
| 32 |
crates-io = { path = "crates/crates-io", version = "0.34.0" } |
| 33 |
crossbeam-utils = "0.8" |
| 34 |
-curl = { version = "0.4.41", features = ["http2"] } |
| 35 |
+curl = { version = "0.4.41", features = [] } |
| 36 |
curl-sys = "0.4.50" |
| 37 |
env_logger = "0.9.0" |
| 38 |
pretty_env_logger = { version = "0.4", optional = true } |
| 39 |
--- rustc-beta-src/src/tools/cargo/src/cargo/sources/registry/http_remote.rs.orig 2022-06-13 07:34:54.000000000 -0700 |
| 40 |
+++ rustc-beta-src/src/tools/cargo/src/cargo/sources/registry/http_remote.rs 2022-06-22 14:03:26.311745485 -0700 |
| 41 |
@@ -183,16 +183,8 @@ |
| 42 |
} |
| 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 |
--- rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs.orig 2022-06-13 07:34:54.000000000 -0700 |
| 61 |
+++ rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs 2022-06-22 14:03:26.311745485 -0700 |
| 62 |
@@ -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 |
- 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 |
+ // Multiplexing is disabled because the system libcurl doesn't support it. |
| 77 |
+ let multi = Multi::new(); |
| 78 |
+ let multiplexing = false; |
| 79 |
|
| 80 |
Ok(PackageSet { |
| 81 |
packages: package_ids |
| 82 |
@@ -658,7 +651,7 @@ |
| 83 |
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 |
} |
Parent Directory
| 
Revision Log