| 1 |
akien |
1848765 |
--- rustc-beta-src/Cargo.lock.orig 2022-03-18 10:27:54.154949492 -0700 |
| 2 |
|
|
+++ rustc-beta-src/Cargo.lock 2022-03-18 10:27:54.156949449 -0700 |
| 3 |
|
|
@@ -958,7 +958,6 @@ |
| 4 |
akien |
1789601 |
dependencies = [ |
| 5 |
|
|
"cc", |
| 6 |
|
|
"libc", |
| 7 |
|
|
- "libnghttp2-sys", |
| 8 |
|
|
"libz-sys", |
| 9 |
|
|
"openssl-sys", |
| 10 |
|
|
"pkg-config", |
| 11 |
akien |
1848765 |
@@ -2009,16 +2008,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 |
1848765 |
--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig 2022-03-18 10:27:54.156949449 -0700 |
| 29 |
|
|
+++ rustc-beta-src/src/tools/cargo/Cargo.toml 2022-03-18 10:29:15.967184238 -0700 |
| 30 |
akien |
1789601 |
@@ -22,7 +22,7 @@ |
| 31 |
|
|
cargo-util = { path = "crates/cargo-util", version = "0.1.2" } |
| 32 |
akien |
1848765 |
crates-io = { path = "crates/crates-io", version = "0.34.0" } |
| 33 |
akien |
1789601 |
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 |
akien |
1848765 |
--- rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs.orig 2022-03-14 11:49:37.000000000 -0700 |
| 40 |
|
|
+++ rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs 2022-03-18 10:27:54.156949449 -0700 |
| 41 |
|
|
@@ -412,14 +412,8 @@ |
| 42 |
akien |
1789601 |
// Also note that pipelining is disabled as curl authors have indicated |
| 43 |
|
|
// that it's buggy, and we've empirically seen that it's buggy with HTTP |
| 44 |
|
|
// proxies. |
| 45 |
|
|
- let mut multi = Multi::new(); |
| 46 |
|
|
- let multiplexing = config.http_config()?.multiplexing.unwrap_or(true); |
| 47 |
|
|
- multi |
| 48 |
|
|
- .pipelining(false, multiplexing) |
| 49 |
|
|
- .with_context(|| "failed to enable multiplexing/pipelining in curl")?; |
| 50 |
|
|
- |
| 51 |
|
|
- // let's not flood crates.io with connections |
| 52 |
|
|
- multi.set_max_host_connections(2)?; |
| 53 |
|
|
+ let multi = Multi::new(); |
| 54 |
|
|
+ let multiplexing = false; |
| 55 |
|
|
|
| 56 |
|
|
Ok(PackageSet { |
| 57 |
|
|
packages: package_ids |
| 58 |
akien |
1848765 |
@@ -648,7 +642,7 @@ |
| 59 |
akien |
1789601 |
macro_rules! try_old_curl { |
| 60 |
|
|
($e:expr, $msg:expr) => { |
| 61 |
|
|
let result = $e; |
| 62 |
|
|
- if cfg!(target_os = "macos") { |
| 63 |
|
|
+ if cfg!(any(target_os = "linux", target_os = "macos")) { |
| 64 |
|
|
if let Err(e) = result { |
| 65 |
|
|
warn!("ignoring libcurl {} error: {}", $msg, e); |
| 66 |
|
|
} |
Parent Directory
| 
Revision Log