berkus
/
actix-web
mirror of https://github.com/fafhrd91/actix-web
1
0
Fork 0
Code Issues Releases Wiki Activity

fix actix-files Responder impl

This commit is contained in:
fakeshadow 2021-01-09 02:01:23 +08:00
parent 46e1f10c55
commit e03899379c
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
actix-files/src/named.rs
View File

@ -19,7 +19,6 @@ use actix_web::{
Error, HttpMessage, HttpRequest, HttpResponse, Responder, Error, HttpMessage, HttpRequest, HttpResponse, Responder,
}; };
use bitflags::bitflags; use bitflags::bitflags;
use futures_util::future::{ready, Ready};
use mime_guess::from_path; use mime_guess::from_path;
use crate::ChunkedReadFile; use crate::ChunkedReadFile;
@ -495,10 +494,8 @@ fn none_match(etag: Option<&header::EntityTag>, req: &HttpRequest) -> bool {
} }
impl Responder for NamedFile { impl Responder for NamedFile {
type Error = Error; fn respond_to(self, req: &HttpRequest) -> HttpResponse {
type Future = Ready<Result<HttpResponse, Error>>; self.into_response(req)
.unwrap_or_else(|e| HttpResponse::from_error(e))
fn respond_to(self, req: &HttpRequest) -> Self::Future {
ready(self.into_response(req))
} }
} }