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

Fix client payload decompression #674

Browse source
This commit is contained in:
Nikolay Kim 2019-03-28 20:40:25 -07:00
parent d9496d46d1
commit cc6e0c6d04
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CHANGES.md
View file

@ -1,6 +1,6 @@
# Changes # Changes
## [x.x.xx] - xxxx-xx-xx ## [0.7.19] - 2019-03-29
### Added ### Added
@ -22,6 +22,9 @@
* Fix never-ending HTTP2 request when response is empty (#709). #737 * Fix never-ending HTTP2 request when response is empty (#709). #737
* Fix client payload decompression #674
## [0.7.18] - 2019-01-10 ## [0.7.18] - 2019-01-10
### Added ### Added

2
Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "actix-web" name = "actix-web"
version = "0.7.18" version = "0.7.19"
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"

9
src/client/pipeline.rs
View file

@ -6,8 +6,8 @@ use std::time::{Duration, Instant};
use std::{io, mem}; use std::{io, mem};
use tokio_timer::Delay; use tokio_timer::Delay;
use actix_inner::dev::Request;
use actix::{Addr, SystemService}; use actix::{Addr, SystemService};
use actix_inner::dev::Request;
use super::{ use super::{
ClientConnector, ClientConnectorError, ClientRequest, ClientResponse, Connect, ClientConnector, ClientConnectorError, ClientRequest, ClientResponse, Connect,
@ -88,7 +88,8 @@ impl SendRequest {
} }
pub(crate) fn with_connector( pub(crate) fn with_connector(
req: ClientRequest, conn: Addr<ClientConnector>, req: ClientRequest,
conn: Addr<ClientConnector>,
) -> SendRequest { ) -> SendRequest {
SendRequest { SendRequest {
req, req,
@ -363,11 +364,11 @@ impl Pipeline {
if let Some(ref mut decompress) = self.decompress { if let Some(ref mut decompress) = self.decompress {
match decompress.feed_data(b) { match decompress.feed_data(b) {
Ok(Some(b)) => return Ok(Async::Ready(Some(b))), Ok(Some(b)) => return Ok(Async::Ready(Some(b))),
Ok(None) => return Ok(Async::NotReady), Ok(None) => continue,
Err(ref err) Err(ref err)
if err.kind() == io::ErrorKind::WouldBlock => if err.kind() == io::ErrorKind::WouldBlock =>
{ {
continue continue;
} }
Err(err) => return Err(err.into()), Err(err) => return Err(err.into()),
} }