actix/actix-web
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-web synced 2025-01-18 13:51:50 +01:00
Code Issues Releases Wiki Activity

Modify response body only if encoder is not None #997

Browse Source
This commit is contained in:
Nikolay Kim 2019-07-22 11:35:00 +06:00
parent b0b462581b
commit f3751d83f8
2 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
actix-http/CHANGES.md
View File

@ -1,5 +1,11 @@
# Changes # Changes
## [0.2.8] - 2019-07-xx
### Fixed
* Invalid response with compression middleware enabled, but compression-related features disabled #997
## [0.2.7] - 2019-07-18 ## [0.2.7] - 2019-07-18
### Added ### Added

12
actix-http/src/encoding/encoder.rs
View File

@ -54,15 +54,18 @@ impl<B: MessageBody> Encoder<B> {
}; };
if can_encode { if can_encode {
// Modify response body only if encoder is not None
if let Some(enc) = ContentEncoder::encoder(encoding) {
update_head(encoding, head); update_head(encoding, head);
head.no_chunking(false); head.no_chunking(false);
ResponseBody::Body(Encoder { return ResponseBody::Body(Encoder {
body, body,
eof: false, eof: false,
fut: None, fut: None,
encoder: ContentEncoder::encoder(encoding), encoder: Some(enc),
}) });
} else { }
}
ResponseBody::Body(Encoder { ResponseBody::Body(Encoder {
body, body,
eof: false, eof: false,
@ -71,7 +74,6 @@ impl<B: MessageBody> Encoder<B> {
}) })
} }
} }
}
enum EncoderBody<B> { enum EncoderBody<B> {
Bytes(Bytes), Bytes(Bytes),