Skip to content
Snippets Groups Projects
Commit 815db0d9 authored by Timo Kösters's avatar Timo Kösters
Browse files

Merge branch 'joinfix' into 'next'

Maybe fix room joins

See merge request famedly/conduit!453
parents c6e3438e 809c9b44
No related branches found
No related tags found
No related merge requests found
......@@ -345,6 +345,7 @@ pub fn get_media_file(&self, key: &[u8]) -> PathBuf {
fn reqwest_client_builder(config: &Config) -> Result<reqwest::ClientBuilder> {
let mut reqwest_client_builder = reqwest::Client::builder()
.pool_max_idle_per_host(0)
.connect_timeout(Duration::from_secs(30))
.timeout(Duration::from_secs(60 * 3));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment