saltyming/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2025-07-12 15:24:59 +00:00
Code Activity

Merge branch 'master' into fmt

Browse source
This commit is contained in:
Daniel García 2021-04-15 18:24:04 +02:00 • committed by GitHub
commit 95d906bdbb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 79 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/api/icons.rs
View file

@ -12,7 +12,7 @@ use regex::Regex;
use reqwest::{blocking::Client, blocking::Response, header, Url};
use rocket::{http::ContentType, http::Cookie, response::Content, Route};
use crate::{error::Error, util::Cached, CONFIG};
use crate::{error::Error, util::{Cached, get_reqwest_client_builder}, CONFIG};
pub fn routes() -> Vec<Route> {
routes![icon]
@ -33,11 +33,11 @@ static CLIENT: Lazy<Client> = Lazy::new(|| {
);
// Reuse the client between requests
Client::builder()
get_reqwest_client_builder()
.timeout(Duration::from_secs(CONFIG.icon_download_timeout()))
.default_headers(default_headers)
.build()
.unwrap()
.expect("Failed to build icon client")
});
// Build Regex only once since this takes a lot of time.