mirrors/actix-web
1
0
Fork 0
mirror of https://github.com/actix/actix-web.git synced 2025-01-04 14:28:50 +00:00
Code Issues Projects Releases Wiki Activity

update deps

Browse source
This commit is contained in:
Nikolay Kim 2019-03-10 14:22:53 -07:00
parent 039efc5703
commit 79875ea039
2 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
actix-files/src/lib.rs
View file

@ -15,11 +15,11 @@ use mime_guess::get_mime_type;
use percent_encoding::{utf8_percent_encode, DEFAULT_ENCODE_SET}; use percent_encoding::{utf8_percent_encode, DEFAULT_ENCODE_SET};
use v_htmlescape::escape as escape_html_entity; use v_htmlescape::escape as escape_html_entity;
use actix_http::error::{Error, ErrorInternalServerError};
use actix_service::{boxed::BoxedNewService, NewService, Service}; use actix_service::{boxed::BoxedNewService, NewService, Service};
use actix_web::dev::{HttpServiceFactory, ResourceDef, ServiceConfig}; use actix_web::dev::{CpuFuture, HttpServiceFactory, ResourceDef, ServiceConfig};
use actix_web::error::{BlockingError, Error, ErrorInternalServerError};
use actix_web::{ use actix_web::{
blocking, FromRequest, HttpRequest, HttpResponse, Responder, ServiceFromRequest, web, FromRequest, HttpRequest, HttpResponse, Responder, ServiceFromRequest,
ServiceRequest, ServiceResponse, ServiceRequest, ServiceResponse,
}; };
use futures::future::{ok, FutureResult}; use futures::future::{ok, FutureResult};
@ -51,16 +51,14 @@ pub struct ChunkedReadFile {
size: u64, size: u64,
offset: u64, offset: u64,
file: Option<File>, file: Option<File>,
fut: Option<blocking::CpuFuture<(File, Bytes), io::Error>>, fut: Option<CpuFuture<(File, Bytes), io::Error>>,
counter: u64, counter: u64,
} }
fn handle_error(err: blocking::BlockingError<io::Error>) -> Error { fn handle_error(err: BlockingError<io::Error>) -> Error {
match err { match err {
blocking::BlockingError::Error(err) => err.into(), BlockingError::Error(err) => err.into(),
blocking::BlockingError::Canceled => { BlockingError::Canceled => ErrorInternalServerError("Unexpected error").into(),
ErrorInternalServerError("Unexpected error").into()
}
} }
} }
@ -90,7 +88,7 @@ impl Stream for ChunkedReadFile {
Ok(Async::Ready(None)) Ok(Async::Ready(None))
} else { } else {
let mut file = self.file.take().expect("Use after completion"); let mut file = self.file.take().expect("Use after completion");
self.fut = Some(blocking::run(move || { self.fut = Some(web::block(move || {
let max_bytes: usize; let max_bytes: usize;
max_bytes = cmp::min(size.saturating_sub(counter), 65_536) as usize; max_bytes = cmp::min(size.saturating_sub(counter), 65_536) as usize;
let mut buf = Vec::with_capacity(max_bytes); let mut buf = Vec::with_capacity(max_bytes);
@ -446,7 +444,6 @@ impl PathBufWrp {
impl<P> FromRequest<P> for PathBufWrp { impl<P> FromRequest<P> for PathBufWrp {
type Error = UriSegmentError; type Error = UriSegmentError;
type Future = Result<Self, Self::Error>; type Future = Result<Self, Self::Error>;
type Config = ();
fn from_request(req: &mut ServiceFromRequest<P>) -> Self::Future { fn from_request(req: &mut ServiceFromRequest<P>) -> Self::Future {
PathBufWrp::get_pathbuf(req.match_info().path()) PathBufWrp::get_pathbuf(req.match_info().path())

1
actix-session/src/lib.rs
View file

@ -175,7 +175,6 @@ impl Session {
impl<P> FromRequest<P> for Session { impl<P> FromRequest<P> for Session {
type Error = Error; type Error = Error;
type Future = Result<Session, Error>; type Future = Result<Session, Error>;
type Config = ();
#[inline] #[inline]
fn from_request(req: &mut ServiceFromRequest<P>) -> Self::Future { fn from_request(req: &mut ServiceFromRequest<P>) -> Self::Future {