From 1109d5a3fed663b56e63db1a9550b692b0b3a710 Mon Sep 17 00:00:00 2001 From: link2xt Date: Sun, 25 Aug 2024 15:01:34 +0000 Subject: [PATCH] fix(http): set I/O timeout to 1 minute rather than whole request timeout Before the fix HTTP client had no connection timeout, so it only had a chance to test one IPv6 and one IPv4 address if the first addresses timed out. Now it can test at least 4 addresses of each family and more if some addresses refuse connection rather than time out. --- src/net.rs | 7 +++++++ src/net/http.rs | 18 +++++++++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/src/net.rs b/src/net.rs index cccba3e666..38ef5cf121 100644 --- a/src/net.rs +++ b/src/net.rs @@ -27,6 +27,13 @@ use tls::wrap_tls; /// This constant should be more than the largest expected RTT. pub(crate) const TIMEOUT: Duration = Duration::from_secs(60); +/// Transaction timeout, e.g. for a GET or POST request +/// together with all connection attempts. +/// +/// This is the worst case time user has to wait on a very slow network +/// after clicking a button and before getting an error message. +pub(crate) const TRANSACTION_TIMEOUT: Duration = Duration::from_secs(300); + /// TTL for caches in seconds. pub(crate) const CACHE_TTL: u64 = 30 * 24 * 60 * 60; diff --git a/src/net/http.rs b/src/net/http.rs index dd9e661a1f..4a66c718fb 100644 --- a/src/net/http.rs +++ b/src/net/http.rs @@ -136,8 +136,24 @@ pub(crate) async fn get_client(context: &Context, load_cache: bool) -> Result