aboutsummaryrefslogtreecommitdiffstats
path: root/src/file_upload.rs
diff options
context:
space:
mode:
authorSven-Hendrik Haase <svenstaro@gmail.com>2020-09-24 02:39:19 +0000
committerSven-Hendrik Haase <svenstaro@gmail.com>2020-09-24 02:39:19 +0000
commit13352ef42532d1f96e3b54059756d8b6e3c7f374 (patch)
tree4d22230eabb8954cedaca8966cc0d40cda5473b1 /src/file_upload.rs
parentSlightly better variable name (diff)
downloadminiserve-13352ef42532d1f96e3b54059756d8b6e3c7f374.tar.gz
miniserve-13352ef42532d1f96e3b54059756d8b6e3c7f374.zip
Add embedded favicon (fixes #364)
Diffstat (limited to 'src/file_upload.rs')
-rw-r--r--src/file_upload.rs7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/file_upload.rs b/src/file_upload.rs
index 136bd45..394afbc 100644
--- a/src/file_upload.rs
+++ b/src/file_upload.rs
@@ -111,6 +111,7 @@ pub fn upload_file(
payload: actix_web::web::Payload,
default_color_scheme: ColorScheme,
uses_random_route: bool,
+ favicon_route: String,
) -> Pin<Box<dyn Future<Output = Result<HttpResponse, actix_web::Error>>>> {
let conf = req.app_data::<crate::MiniserveConfig>().unwrap();
let return_path = if let Some(header) = req.headers().get(header::REFERER) {
@@ -139,6 +140,7 @@ pub fn upload_file(
color_scheme,
default_color_scheme,
uses_random_route,
+ &favicon_route,
));
}
};
@@ -159,6 +161,7 @@ pub fn upload_file(
color_scheme,
default_color_scheme,
uses_random_route,
+ &favicon_route,
));
}
};
@@ -179,6 +182,7 @@ pub fn upload_file(
color_scheme,
default_color_scheme,
uses_random_route,
+ &favicon_route,
));
}
};
@@ -204,6 +208,7 @@ pub fn upload_file(
color_scheme,
default_color_scheme,
uses_random_route,
+ &favicon_route,
),
}),
)
@@ -220,6 +225,7 @@ fn create_error_response(
color_scheme: ColorScheme,
default_color_scheme: ColorScheme,
uses_random_route: bool,
+ favicon_route: &str,
) -> future::Ready<Result<HttpResponse, actix_web::Error>> {
errors::log_error_chain(description.to_string());
future::ok(
@@ -236,6 +242,7 @@ fn create_error_response(
default_color_scheme,
true,
!uses_random_route,
+ &favicon_route,
)
.into_string(),
),