mirrors/actix-web
1
0
Fork 0
mirror of https://github.com/actix/actix-web.git synced 2024-06-02 21:39:26 +00:00
Code Issues Projects Releases Wiki Activity

do not add error response if current response is in process

Browse source
This commit is contained in:
Nikolay Kim 2017-10-29 14:51:30 -07:00
parent a1b7d5995e
commit 6b2248ecdf
3 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/lib.rs
View file

@ -60,7 +60,7 @@ pub use context::HttpContext;
pub use staticfiles::StaticFiles;
// re-exports
pub use http::{Method, StatusCode};
pub use http::{Method, StatusCode, Version};
pub use cookie::{Cookie, CookieBuilder};
pub use cookie::{ParseError as CookieParseError};
pub use http_range::{HttpRange, HttpRangeParseError};

16
src/server.rs
View file

@ -324,13 +324,15 @@ impl<T, A, H> Future for HttpChannel<T, A, H>
// tasks need to be completed
self.error = true;
if let ReaderError::Error(err) = err {
self.items.push_back(
Entry {task: Task::reply(err),
req: UnsafeCell::new(HttpRequest::for_error()),
eof: false,
error: false,
finished: false});
if self.items.is_empty() {
if let ReaderError::Error(err) = err {
self.items.push_back(
Entry {task: Task::reply(err),
req: UnsafeCell::new(HttpRequest::for_error()),
eof: false,
error: false,
finished: false});
}
}
}
Ok(Async::NotReady) => {

1
src/task.rs
View file

@ -412,7 +412,6 @@ impl Task {
fut.borrow_mut().set()
}
self.drain.clear();
// return self.poll_io(io, req);
}
// response is completed