Merge remote-tracking branch 'mainrepo/master' into pullrequest.hashed-password

2 files changed, 9 insertions, 7 deletions

diff --git a/src/file_upload.rs b/src/file_upload.rs
index 534083c..88f8a7c 100644
--- a/src/file_upload.rs
+++ b/src/file_upload.rs
@@ -101,10 +101,11 @@ fn handle_multipart(
 /// invalid.
 /// This method returns future.
 pub fn upload_file(req: &HttpRequest<crate::MiniserveConfig>) -> FutureResponse<HttpResponse> {
-    let return_path: String = req.headers()[header::REFERER]
-        .to_str()
-        .unwrap_or("/")
-        .to_owned();
+    let return_path = if let Some(header) = req.headers().get(header::REFERER) {
+        header.to_str().unwrap_or("/").to_owned()
+    } else {
+        "/".to_string()
+    };
     let app_root_dir = if let Ok(dir) = req.state().path.canonicalize() {
         dir
     } else {
diff --git a/src/main.rs b/src/main.rs
index 96e05c0..e63b505 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -194,9 +194,10 @@ fn configure_app(app: App<MiniserveConfig>) -> App<MiniserveConfig> {
         let random_route = app.state().random_route.clone();
         let default_color_scheme = app.state().default_color_scheme.clone();
         let file_upload = app.state().file_upload;
-        upload_route = match app.state().random_route.clone() {
-            Some(random_route) => format!("/{}/upload", random_route),
-            None => "/upload".to_string(),
+        upload_route = if let Some(random_route) = app.state().random_route.clone() {
+            format!("/{}/upload", random_route)
+        } else {
+            "/upload".to_string()
         };
         if path.is_file() {
             None