mirrors/lemmy
1
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2025-02-27 08:06:42 +00:00
Code Issues Projects Releases Wiki Activity

Reinstate 30 second pict-rs timeout

Browse source
This commit is contained in:
Aode (lion) 2021-12-06 18:22:30 -06:00
parent 338f0a63a1
commit 737161ceca
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
crates/routes/src/images.rs
View file

@ -10,6 +10,7 @@ use lemmy_websocket::LemmyContext;
use reqwest::Body; use reqwest::Body;
use reqwest_middleware::{ClientWithMiddleware, RequestBuilder}; use reqwest_middleware::{ClientWithMiddleware, RequestBuilder};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::time::Duration;
pub fn config(cfg: &mut web::ServiceConfig, client: ClientWithMiddleware, rate_limit: &RateLimit) { pub fn config(cfg: &mut web::ServiceConfig, client: ClientWithMiddleware, rate_limit: &RateLimit) {
cfg cfg
@ -50,16 +51,20 @@ fn adapt_request(
// remove accept-encoding header so that pictrs doesnt compress the response // remove accept-encoding header so that pictrs doesnt compress the response
const INVALID_HEADERS: &[HeaderName] = &[ACCEPT_ENCODING, HOST]; const INVALID_HEADERS: &[HeaderName] = &[ACCEPT_ENCODING, HOST];
request.headers().iter().fold( let client_request = client
client.request(request.method().clone(), url), .request(request.method().clone(), url)
|client_req, (key, value)| { .timeout(Duration::from_secs(30));
request
.headers()
.iter()
.fold(client_request, |client_req, (key, value)| {
if INVALID_HEADERS.contains(key) { if INVALID_HEADERS.contains(key) {
client_req client_req
} else { } else {
client_req.header(key, value) client_req.header(key, value)
} }
}, })
)
} }
async fn upload( async fn upload(