From 984d17a78665adc7ea4731024b92a51068864efc Mon Sep 17 00:00:00 2001
From: Remi Dettai <remi.dettai@sekoia.io>
Date: Wed, 7 Oct 2026 15:05:13 +0200
Subject: [PATCH 1/2] Bump rustls with Trinity's fix

---
 quickwit/Cargo.lock | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/quickwit/Cargo.lock b/quickwit/Cargo.lock
index 833508339ce..db179ea4204 100644
--- a/quickwit/Cargo.lock
+++ b/quickwit/Cargo.lock
@@ -790,7 +790,7 @@ dependencies = [
  "serde",
  "serde_json",
  "tokio",
- "tokio-rustls 0.26.4",
+ "tokio-rustls 0.26.6",
  "tower 0.5.2",
  "tracing",
 ]
@@ -3746,7 +3746,7 @@ dependencies = [
  "rustls-native-certs",
  "rustls-pki-types",
  "tokio",
- "tokio-rustls 0.26.4",
+ "tokio-rustls 0.26.6",
  "tower-service",
  "webpki-roots 1.0.5",
 ]
@@ -7275,7 +7275,7 @@ dependencies = [
  "thiserror 2.0.17",
  "time",
  "tokio",
- "tokio-rustls 0.26.4",
+ "tokio-rustls 0.26.6",
  "tokio-stream",
  "tokio-util",
  "tonic 0.14.2",
@@ -7798,7 +7798,7 @@ dependencies = [
  "sync_wrapper",
  "tokio",
  "tokio-native-tls",
- "tokio-rustls 0.26.4",
+ "tokio-rustls 0.26.6",
  "tokio-util",
  "tower 0.5.2",
  "tower-http",
@@ -9701,9 +9701,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-rustls"
-version = "0.26.4"
+version = "0.26.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61"
+checksum = "c9cc2678c2cdd569ef8215e2afd7954ada2ae20b4fdd2c5fe6139a3b02d105db"
 dependencies = [
  "rustls 0.23.36",
  "tokio",
@@ -9807,7 +9807,7 @@ dependencies = [
  "prost 0.13.5",
  "rustls-pemfile",
  "tokio",
- "tokio-rustls 0.26.4",
+ "tokio-rustls 0.26.6",
  "tokio-stream",
  "tower 0.4.13",
  "tower-layer",
@@ -9840,7 +9840,7 @@ dependencies = [
  "socket2 0.6.1",
  "sync_wrapper",
  "tokio",
- "tokio-rustls 0.26.4",
+ "tokio-rustls 0.26.6",
  "tokio-stream",
  "tower 0.5.2",
  "tower-layer",

From 8cdd8da5ace465b303e998b38430f130eb9d411b Mon Sep 17 00:00:00 2001
From: Remi Dettai <remi.dettai@sekoia.io>
Date: Thu, 8 Oct 2026 16:51:39 +0200
Subject: [PATCH 2/2] Patch tokio-rustls with the poll_read cap from
 rustls/tokio-rustls#209

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 quickwit/Cargo.lock | 3 +--
 quickwit/Cargo.toml | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/quickwit/Cargo.lock b/quickwit/Cargo.lock
index db179ea4204..aa1c9b5027b 100644
--- a/quickwit/Cargo.lock
+++ b/quickwit/Cargo.lock
@@ -9702,8 +9702,7 @@ dependencies = [
 [[package]]
 name = "tokio-rustls"
 version = "0.26.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9cc2678c2cdd569ef8215e2afd7954ada2ae20b4fdd2c5fe6139a3b02d105db"
+source = "git+https://github.com/rdettai-sk/tokio-rustls?rev=a50d9b3401e86b829abc74feb38e576231f84ee2#a50d9b3401e86b829abc74feb38e576231f84ee2"
 dependencies = [
  "rustls 0.23.36",
  "tokio",
diff --git a/quickwit/Cargo.toml b/quickwit/Cargo.toml
index 549e997b961..50a85bb4763 100644
--- a/quickwit/Cargo.toml
+++ b/quickwit/Cargo.toml
@@ -375,6 +375,8 @@ encoding_rs = "=0.8.35"
 [patch.crates-io]
 sasl2-sys = { git = "https://github.com/quickwit-oss/rust-sasl/", rev = "085a4c7" }
 tantivy-fst = { git = "https://github.com/SekoiaLab/fst/", rev = "39ccb1c9283034815e22eb663d673a9e37023e7c" }
+# Caps the bytes a single `TlsStream::poll_read` returns (https://github.com/rustls/tokio-rustls/pull/209).
+tokio-rustls = { git = "https://github.com/rdettai-sk/tokio-rustls", rev = "a50d9b3401e86b829abc74feb38e576231f84ee2" }
 
 ## this patched version of tracing helps better understand what happens inside futures (when are
 ## they polled, how long does poll take...)