86638a
--- rustc-1.58.0-src/Cargo.lock.orig	2022-01-11 16:13:10.125323813 -0800
86638a
+++ rustc-1.58.0-src/Cargo.lock	2022-01-11 16:22:54.313011908 -0800
86638a
@@ -909,7 +909,6 @@
892f9b
 dependencies = [
892f9b
  "cc",
892f9b
  "libc",
892f9b
- "libnghttp2-sys",
892f9b
  "libz-sys",
892f9b
  "openssl-sys",
892f9b
  "pkg-config",
86638a
@@ -1927,16 +1926,6 @@
892f9b
 checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a"
892f9b
 
892f9b
 [[package]]
892f9b
-name = "libnghttp2-sys"
892f9b
-version = "0.1.4+1.41.0"
892f9b
-source = "registry+https://github.com/rust-lang/crates.io-index"
892f9b
-checksum = "03624ec6df166e79e139a2310ca213283d6b3c30810c54844f307086d4488df1"
892f9b
-dependencies = [
892f9b
- "cc",
892f9b
- "libc",
892f9b
-]
892f9b
-
892f9b
-[[package]]
892f9b
 name = "libz-sys"
b0e138
 version = "1.1.3"
892f9b
 source = "registry+https://github.com/rust-lang/crates.io-index"
86638a
--- rustc-1.58.0-src/src/tools/cargo/Cargo.toml.orig	2022-01-11 16:13:10.127323771 -0800
86638a
+++ rustc-1.58.0-src/src/tools/cargo/Cargo.toml	2022-01-11 16:14:50.721203730 -0800
86638a
@@ -22,7 +22,7 @@
b0e138
 cargo-util = { path = "crates/cargo-util", version = "0.1.1" }
892f9b
 crates-io = { path = "crates/crates-io", version = "0.33.0" }
892f9b
 crossbeam-utils = "0.8"
86638a
-curl = { version = "0.4.41", features = ["http2"] }
86638a
+curl = { version = "0.4.41", features = [] }
86638a
 curl-sys = "0.4.50"
b0e138
 env_logger = "0.9.0"
892f9b
 pretty_env_logger = { version = "0.4", optional = true }
86638a
--- rustc-1.58.0-src/src/tools/cargo/src/cargo/core/package.rs.orig	2022-01-11 03:18:44.000000000 -0800
86638a
+++ rustc-1.58.0-src/src/tools/cargo/src/cargo/core/package.rs	2022-01-11 16:13:10.127323771 -0800
86638a
@@ -419,14 +419,8 @@
892f9b
         // Also note that pipelining is disabled as curl authors have indicated
892f9b
         // that it's buggy, and we've empirically seen that it's buggy with HTTP
892f9b
         // proxies.
892f9b
-        let mut multi = Multi::new();
892f9b
-        let multiplexing = config.http_config()?.multiplexing.unwrap_or(true);
892f9b
-        multi
892f9b
-            .pipelining(false, multiplexing)
892f9b
-            .with_context(|| "failed to enable multiplexing/pipelining in curl")?;
892f9b
-
892f9b
-        // let's not flood crates.io with connections
892f9b
-        multi.set_max_host_connections(2)?;
892f9b
+        let multi = Multi::new();
892f9b
+        let multiplexing = false;
892f9b
 
892f9b
         Ok(PackageSet {
892f9b
             packages: package_ids
86638a
@@ -655,7 +649,7 @@
892f9b
 macro_rules! try_old_curl {
892f9b
     ($e:expr, $msg:expr) => {
892f9b
         let result = $e;
892f9b
-        if cfg!(target_os = "macos") {
892f9b
+        if cfg!(any(target_os = "linux", target_os = "macos")) {
892f9b
             if let Err(e) = result {
892f9b
                 warn!("ignoring libcurl {} error: {}", $msg, e);
892f9b
             }