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

Re-use a basic request in all possible cases

Browse source
This commit is contained in:
Aode (Lion) 2022-01-24 18:42:15 -06:00 • committed by Aode (lion)
parent 20006c91af
commit f8d1c1a8af
4 changed files with 44 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/server_server.rs
View file

@ -237,21 +237,25 @@ where
let url = reqwest_request.url().clone();
let mut client = globals.reqwest_client()?;
if let Some((override_name, port)) = globals
let client = if let Some((override_name, port)) = globals
.tls_name_override
.read()
.unwrap()
.get(&actual_destination.hostname())
{
client = client.resolve(
&actual_destination.hostname(),
SocketAddr::new(override_name[0], *port),
);
globals
.reqwest_client_builder()?
.resolve(
&actual_destination.hostname(),
SocketAddr::new(override_name[0], *port),
)
.build()?
// port will be ignored
}
} else {
globals.reqwest_client()
};
let response = client.build()?.execute(reqwest_request).await;
let response = client.execute(reqwest_request).await;
match response {
Ok(mut response) => {
@ -492,9 +496,6 @@ async fn request_well_known(
let body: serde_json::Value = serde_json::from_str(
&globals
.reqwest_client()
.ok()?
.build()
.ok()?
.get(&format!(
"https://{}/.well-known/matrix/server",
destination