|
 |
4ac2b7 |
--- rustc-beta-src/Cargo.lock.orig 2021-06-04 15:56:04.141227630 -0700
|
|
|
4ac2b7 |
+++ rustc-beta-src/Cargo.lock 2021-06-04 16:03:04.461396826 -0700
|
|
|
4ac2b7 |
@@ -885,7 +885,6 @@
|
|
|
f7bb61 |
dependencies = [
|
|
|
f7bb61 |
"cc",
|
|
|
f7bb61 |
"libc",
|
|
|
f7bb61 |
- "libnghttp2-sys",
|
|
|
f7bb61 |
"libz-sys",
|
|
|
f7bb61 |
"openssl-sys",
|
|
|
f7bb61 |
"pkg-config",
|
|
|
4ac2b7 |
@@ -1904,16 +1903,6 @@
|
|
|
4ac2b7 |
checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a"
|
|
|
f7bb61 |
|
|
|
f7bb61 |
[[package]]
|
|
|
f7bb61 |
-name = "libnghttp2-sys"
|
|
|
f7bb61 |
-version = "0.1.4+1.41.0"
|
|
|
f7bb61 |
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
|
f7bb61 |
-checksum = "03624ec6df166e79e139a2310ca213283d6b3c30810c54844f307086d4488df1"
|
|
|
f7bb61 |
-dependencies = [
|
|
|
f7bb61 |
- "cc",
|
|
|
f7bb61 |
- "libc",
|
|
|
f7bb61 |
-]
|
|
|
f7bb61 |
-
|
|
|
f7bb61 |
-[[package]]
|
|
|
f7bb61 |
name = "libz-sys"
|
|
|
905bf8 |
version = "1.1.2"
|
|
|
f7bb61 |
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
|
4ac2b7 |
--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig 2021-06-04 15:56:04.143227587 -0700
|
|
|
4ac2b7 |
+++ rustc-beta-src/src/tools/cargo/Cargo.toml 2021-06-04 15:57:56.931857927 -0700
|
|
|
f7bb61 |
@@ -25,7 +25,7 @@
|
|
|
4ac2b7 |
cargo-util = { path = "crates/cargo-util", version = "0.1.0" }
|
|
|
778c89 |
crates-io = { path = "crates/crates-io", version = "0.33.0" }
|
|
|
905bf8 |
crossbeam-utils = "0.8"
|
|
|
f7bb61 |
-curl = { version = "0.4.23", features = ["http2"] }
|
|
|
f7bb61 |
+curl = { version = "0.4.23", features = [] }
|
|
|
f7bb61 |
curl-sys = "0.4.22"
|
|
|
905bf8 |
env_logger = "0.8.1"
|
|
|
f7bb61 |
pretty_env_logger = { version = "0.4", optional = true }
|
|
|
4ac2b7 |
--- rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs.orig 2021-05-22 15:22:31.000000000 -0700
|
|
|
4ac2b7 |
+++ rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs 2021-06-04 16:00:03.903190293 -0700
|
|
|
4ac2b7 |
@@ -416,14 +416,8 @@
|
|
|
f7bb61 |
// Also note that pipelining is disabled as curl authors have indicated
|
|
|
f7bb61 |
// that it's buggy, and we've empirically seen that it's buggy with HTTP
|
|
|
f7bb61 |
// proxies.
|
|
|
f7bb61 |
- let mut multi = Multi::new();
|
|
|
f7bb61 |
- let multiplexing = config.http_config()?.multiplexing.unwrap_or(true);
|
|
|
f7bb61 |
- multi
|
|
|
f7bb61 |
- .pipelining(false, multiplexing)
|
|
|
4ac2b7 |
- .with_context(|| "failed to enable multiplexing/pipelining in curl")?;
|
|
|
f7bb61 |
-
|
|
|
f7bb61 |
- // let's not flood crates.io with connections
|
|
|
f7bb61 |
- multi.set_max_host_connections(2)?;
|
|
|
f7bb61 |
+ let multi = Multi::new();
|
|
|
f7bb61 |
+ let multiplexing = false;
|
|
|
f7bb61 |
|
|
|
f7bb61 |
Ok(PackageSet {
|
|
|
f7bb61 |
packages: package_ids
|
|
|
4ac2b7 |
@@ -596,7 +590,7 @@
|
|
|
f7bb61 |
macro_rules! try_old_curl {
|
|
|
f7bb61 |
($e:expr, $msg:expr) => {
|
|
|
f7bb61 |
let result = $e;
|
|
|
f7bb61 |
- if cfg!(target_os = "macos") {
|
|
|
f7bb61 |
+ if cfg!(any(target_os = "linux", target_os = "macos")) {
|
|
|
f7bb61 |
if let Err(e) = result {
|
|
|
f7bb61 |
warn!("ignoring libcurl {} error: {}", $msg, e);
|
|
|
f7bb61 |
}
|