mirrors/actix-web
1
0
Fork 0
mirror of https://github.com/actix/actix-web.git synced 2024-10-03 16:51:58 +00:00
Code Issues Projects Releases Wiki Activity

Fix http/2 payload streaming #215

Browse source
This commit is contained in:
Nikolay Kim 2018-05-08 15:44:50 -07:00
parent ba816a8562
commit 47d80382b2
6 changed files with 23 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGES.md
View file

@ -1,6 +1,8 @@
# Changes # Changes
## 0.6.1 (2018-05-xx) ## 0.6.1 (2018-05-08)
* Fix http/2 payload streaming #215
* Fix connector's default `keep-alive` and `lifetime` settings #212 * Fix connector's default `keep-alive` and `lifetime` settings #212

2
Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "actix-web" name = "actix-web"
version = "0.6.0" version = "0.6.1"
authors = ["Nikolay Kim <fafhrd91@gmail.com>"] authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
description = "Actix web is a simple, pragmatic and extremely fast web framework for Rust." description = "Actix web is a simple, pragmatic and extremely fast web framework for Rust."
readme = "README.md" readme = "README.md"

4
src/pipeline.rs
View file

@ -492,8 +492,8 @@ impl<S: 'static, H> ProcessResponse<S, H> {
if let Some(err) = self.resp.error() { if let Some(err) = self.resp.error() {
if self.resp.status().is_server_error() { if self.resp.status().is_server_error() {
error!( error!(
"Error occured during request handling: {}", "Error occured during request handling, status: {} {}",
err self.resp.status(), err
); );
} else { } else {
warn!( warn!(

4
src/scope.rs
View file

@ -787,10 +787,10 @@ mod tests {
let mut app = App::new() let mut app = App::new()
.scope("app", |scope| { .scope("app", |scope| {
scope scope
.route("/path1", Method::GET, |r: HttpRequest<_>| { .route("/path1", Method::GET, |_: HttpRequest<_>| {
HttpResponse::Ok() HttpResponse::Ok()
}) })
.route("/path1", Method::DELETE, |r: HttpRequest<_>| { .route("/path1", Method::DELETE, |_: HttpRequest<_>| {
HttpResponse::Ok() HttpResponse::Ok()
}) })
}) })

25
src/server/h2.rs
View file

@ -343,24 +343,27 @@ impl<H: 'static> Entry<H> {
} }
fn poll_payload(&mut self) { fn poll_payload(&mut self) {
if !self.flags.contains(EntryFlags::REOF) { while !self.flags.contains(EntryFlags::REOF)
if self.payload.need_read() == PayloadStatus::Read { && self.payload.need_read() == PayloadStatus::Read
if let Err(err) = self.recv.release_capacity().release_capacity(32_768) { {
self.payload.set_error(PayloadError::Http2(err))
}
} else if let Err(err) = self.recv.release_capacity().release_capacity(0) {
self.payload.set_error(PayloadError::Http2(err))
}
match self.recv.poll() { match self.recv.poll() {
Ok(Async::Ready(Some(chunk))) => { Ok(Async::Ready(Some(chunk))) => {
let l = chunk.len();
self.payload.feed_data(chunk); self.payload.feed_data(chunk);
if let Err(err) = self.recv.release_capacity().release_capacity(l) {
self.payload.set_error(PayloadError::Http2(err));
break;
}
} }
Ok(Async::Ready(None)) => { Ok(Async::Ready(None)) => {
self.flags.insert(EntryFlags::REOF); self.flags.insert(EntryFlags::REOF);
self.payload.feed_eof();
}
Ok(Async::NotReady) => break,
Err(err) => {
self.payload.set_error(PayloadError::Http2(err));
break;
} }
Ok(Async::NotReady) => (),
Err(err) => self.payload.set_error(PayloadError::Http2(err)),
} }
} }
} }

2
tests/test_server.rs
View file

@ -809,7 +809,7 @@ fn test_h2() {
}) })
}); });
let _res = core.run(tcp); let _res = core.run(tcp);
// assert_eq!(res.unwrap(), Bytes::from_static(STR.as_ref())); // assert_eq!(_res.unwrap(), Bytes::from_static(STR.as_ref()));
} }
#[test] #[test]