From ee290add4596840f0c3a34a56e043c997c9d5e29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Thu, 9 Apr 2020 16:27:43 +0200
Subject: [PATCH] async_client: Build the URL path a bit more cleanly.

---
 src/async_client.rs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/async_client.rs b/src/async_client.rs
index 51aad272..f5bb1906 100644
--- a/src/async_client.rs
+++ b/src/async_client.rs
@@ -564,10 +564,11 @@ impl AsyncClient {
     {
         let request: http::Request<Vec<u8>> = request.try_into()?;
         let url = request.uri();
-        let url = self
-            .homeserver
-            .join(url.path_and_query().unwrap().as_str())
-            .unwrap();
+        let path_and_query = url.path_and_query().unwrap();
+        let mut url = self.homeserver.clone();
+
+        url.set_path(path_and_query.path());
+        url.set_query(path_and_query.query());
 
         trace!("Doing request {:?}", url);