magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'jplatte/up-axum' into 'next'

Browse source 
Upgrade axum to 0.5

See merge request famedly/conduit!335
This commit is contained in:
Timo Kösters 2022-04-01 08:33:22 +00:00
commit 7bc84dc971
3 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/ruma_wrapper/axum.rs
View file

@ -154,6 +154,7 @@ where
TypedHeaderRejectionReason::Error(_) => {
"Invalid X-Matrix signatures."
}
_ => "Unknown header-related error",
};
Error::BadRequest(ErrorKind::Forbidden, msg)
@ -247,8 +248,7 @@ where
};
let mut http_request = http::Request::builder().uri(req.uri()).method(req.method());
*http_request.headers_mut().unwrap() =
req.headers().expect("Headers already extracted").clone();
*http_request.headers_mut().unwrap() = req.headers().clone();
if let Some(CanonicalJsonValue::Object(json_body)) = &mut json_body {
let user_id = sender_user.clone().unwrap_or_else(|| {