re-add a broken patch rename

2022-04-07 10:33:38 -07:00 · 2022-04-07 10:33:38 -07:00 · 70748e85ce
commit 70748e85ce
parent 04da44cfe0
1 changed files with 66 additions and 0 deletions
--- a/rustc-1.60.0-disable-http2.patch
+++ b/rustc-1.60.0-disable-http2.patch
@ -0,0 +1,66 @@
+--- rustc-beta-src/Cargo.lock.orig	2022-03-18 10:27:54.154949492 -0700
+++ rustc-beta-src/Cargo.lock	2022-03-18 10:27:54.156949449 -0700
+@@ -958,7 +958,6 @@
+ dependencies = [
+  "cc",
+  "libc",
+- "libnghttp2-sys",
+  "libz-sys",
+  "openssl-sys",
+  "pkg-config",
+@@ -2009,16 +2008,6 @@
+ checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a"
+ 
+ [[package]]
+-name = "libnghttp2-sys"
+-version = "0.1.4+1.41.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "03624ec6df166e79e139a2310ca213283d6b3c30810c54844f307086d4488df1"
+-dependencies = [
+- "cc",
+- "libc",
+-]
+-
+-[[package]]
+ name = "libz-sys"
+ version = "1.1.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig	2022-03-18 10:27:54.156949449 -0700
+++ rustc-beta-src/src/tools/cargo/Cargo.toml	2022-03-18 10:29:15.967184238 -0700
+@@ -22,7 +22,7 @@
+ cargo-util = { path = "crates/cargo-util", version = "0.1.2" }
+ crates-io = { path = "crates/crates-io", version = "0.34.0" }
+ crossbeam-utils = "0.8"
+-curl = { version = "0.4.41", features = ["http2"] }
+curl = { version = "0.4.41", features = [] }
+ curl-sys = "0.4.50"
+ env_logger = "0.9.0"
+ pretty_env_logger = { version = "0.4", optional = true }
+--- rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs.orig	2022-03-14 11:49:37.000000000 -0700
+++ rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs	2022-03-18 10:27:54.156949449 -0700
+@@ -412,14 +412,8 @@
+         // Also note that pipelining is disabled as curl authors have indicated
+         // that it's buggy, and we've empirically seen that it's buggy with HTTP
+         // proxies.
+-        let mut multi = Multi::new();
+-        let multiplexing = config.http_config()?.multiplexing.unwrap_or(true);
+-        multi
+-            .pipelining(false, multiplexing)
+-            .with_context(|| "failed to enable multiplexing/pipelining in curl")?;
+-
+-        // let's not flood crates.io with connections
+-        multi.set_max_host_connections(2)?;
+        let multi = Multi::new();
+        let multiplexing = false;
+ 
+         Ok(PackageSet {
+             packages: package_ids
+@@ -648,7 +642,7 @@
+ macro_rules! try_old_curl {
+     ($e:expr, $msg:expr) => {
+         let result = $e;
+-        if cfg!(target_os = "macos") {
+        if cfg!(any(target_os = "linux", target_os = "macos")) {
+             if let Err(e) = result {
+                 warn!("ignoring libcurl {} error: {}", $msg, e);
+             }