actix/actix-extras
1
0
Fork 0
mirror of https://github.com/actix/actix-extras.git synced 2025-01-22 23:05:56 +01:00
Code Issues Releases Wiki Activity

Static files are incorrectly served as both chunked and with length #812

Browse Source
This commit is contained in:
Nikolay Kim 2019-06-01 17:57:40 +06:00
parent 666756bfbe
commit 15cdc680f6
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
actix-files/CHANGES.md
View File

@ -1,5 +1,9 @@
# Changes # Changes
## [0.1.1] - 2019-06-01
* Static files are incorrectly served as both chunked and with length #812
## [0.1.0] - 2019-05-25 ## [0.1.0] - 2019-05-25
* NamedFile last-modified check always fails due to nano-seconds * NamedFile last-modified check always fails due to nano-seconds

1
actix-files/Cargo.toml
View File

@ -19,6 +19,7 @@ path = "src/lib.rs"
[dependencies] [dependencies]
actix-web = "1.0.0-rc" actix-web = "1.0.0-rc"
actix-http = "0.2.2"
actix-service = "0.4.0" actix-service = "0.4.0"
bitflags = "1" bitflags = "1"
bytes = "0.4" bytes = "0.4"

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

@ -11,6 +11,7 @@ use bitflags::bitflags;
use mime; use mime;
use mime_guess::guess_mime_type; use mime_guess::guess_mime_type;
use actix_http::body::SizedStream;
use actix_web::http::header::{ use actix_web::http::header::{
self, ContentDisposition, DispositionParam, DispositionType, self, ContentDisposition, DispositionParam, DispositionType,
}; };
@ -434,7 +435,7 @@ impl Responder for NamedFile {
if offset != 0 || length != self.md.len() { if offset != 0 || length != self.md.len() {
return Ok(resp.status(StatusCode::PARTIAL_CONTENT).streaming(reader)); return Ok(resp.status(StatusCode::PARTIAL_CONTENT).streaming(reader));
}; };
Ok(resp.streaming(reader)) Ok(resp.body(SizedStream::new(length, reader)))
} }
} }
} }

4
src/lib.rs
View File

@ -111,7 +111,7 @@ pub use actix_web_codegen::*;
// re-export for convenience // re-export for convenience
pub use actix_http::Response as HttpResponse; pub use actix_http::Response as HttpResponse;
pub use actix_http::{cookie, http, Error, HttpMessage, ResponseError, Result}; pub use actix_http::{body, cookie, http, Error, HttpMessage, ResponseError, Result};
pub use crate::app::App; pub use crate::app::App;
pub use crate::extract::FromRequest; pub use crate::extract::FromRequest;
@ -143,7 +143,7 @@ pub mod dev {
pub use crate::types::json::JsonBody; pub use crate::types::json::JsonBody;
pub use crate::types::readlines::Readlines; pub use crate::types::readlines::Readlines;
pub use actix_http::body::{Body, BodySize, MessageBody, ResponseBody}; pub use actix_http::body::{Body, BodySize, MessageBody, ResponseBody, SizedStream};
pub use actix_http::encoding::Decoder as Decompress; pub use actix_http::encoding::Decoder as Decompress;
pub use actix_http::ResponseBuilder as HttpResponseBuilder; pub use actix_http::ResponseBuilder as HttpResponseBuilder;
pub use actix_http::{ pub use actix_http::{