diff options
| author | Sven-Hendrik Haase <svenstaro@gmail.com> | 2020-02-27 16:06:39 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-27 16:06:39 +0000 |
| commit | 09f2d24a236924472e7f3297cdc69a60cb47f531 (patch) | |
| tree | c260547c4493a3400217209706dc2a949ecba187 /src/file_upload.rs | |
| parent | Merge pull request #262 from svenstaro/dependabot/cargo/alphanumeric-sort-1.0.12 (diff) | |
| parent | added missing head tag (diff) | |
| download | miniserve-09f2d24a236924472e7f3297cdc69a60cb47f531.tar.gz miniserve-09f2d24a236924472e7f3297cdc69a60cb47f531.zip | |
Merge pull request #177 from ghost/fix-#173
Fix #173
Diffstat (limited to 'src/file_upload.rs')
| -rw-r--r-- | src/file_upload.rs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/file_upload.rs b/src/file_upload.rs index 3ef3a7e..900792f 100644 --- a/src/file_upload.rs +++ b/src/file_upload.rs @@ -120,6 +120,7 @@ fn handle_multipart( pub fn upload_file( req: &HttpRequest<crate::MiniserveConfig>, default_color_scheme: ColorScheme, + uses_random_route: bool ) -> FutureResponse<HttpResponse> { let return_path = if let Some(header) = req.headers().get(header::REFERER) { header.to_str().unwrap_or("/").to_owned() @@ -146,6 +147,7 @@ pub fn upload_file( query_params.order, color_scheme, default_color_scheme, + uses_random_route )); } }; @@ -165,6 +167,7 @@ pub fn upload_file( query_params.order, color_scheme, default_color_scheme, + uses_random_route )); } }; @@ -184,6 +187,7 @@ pub fn upload_file( query_params.order, color_scheme, default_color_scheme, + uses_random_route )); } }; @@ -208,12 +212,14 @@ pub fn upload_file( query_params.order, color_scheme, default_color_scheme, + uses_random_route ), }), ) } /// Convenience method for creating response errors, if file upload fails. +#[allow(clippy::too_many_arguments)] fn create_error_response( description: &str, error_code: StatusCode, @@ -222,6 +228,7 @@ fn create_error_response( sorting_order: Option<SortingOrder>, color_scheme: ColorScheme, default_color_scheme: ColorScheme, + uses_random_route: bool ) -> FutureResult<HttpResponse, actix_web::error::Error> { errors::log_error_chain(description.to_string()); future::ok( @@ -237,7 +244,7 @@ fn create_error_response( color_scheme, default_color_scheme, true, - true, + !uses_random_route, ) .into_string(), ), |