actix/actix-web
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-web synced 2024-11-30 18:44:35 +01:00
Code Issues Releases Wiki Activity

Fix panic on unknown content encoding

Browse Source
This commit is contained in:
Nikolay Kim 2018-03-11 14:50:13 -07:00
parent fee1e255ac
commit 31fbbd3168
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES.md
View File

@ -1,5 +1,9 @@
# Changes # Changes
## 0.4.7 (2018-03-xx)
* Fix panic on unknown content encoding
## 0.4.6 (2018-03-10) ## 0.4.6 (2018-03-10)
* Fix client cookie handling * Fix client cookie handling

2
src/handler.rs
View File

@ -52,7 +52,7 @@ pub trait Responder {
/// Either::A( /// Either::A(
/// httpcodes::HttpBadRequest.with_body("Bad data")) /// httpcodes::HttpBadRequest.with_body("Bad data"))
/// } else { /// } else {
/// Either::B( // <- variant B /// Either::B( // <- variant B
/// result(HttpResponse::Ok() /// result(HttpResponse::Ok()
/// .content_type("text/html") /// .content_type("text/html")
/// .body(format!("Hello!")) /// .body(format!("Hello!"))

3
src/header/mod.rs
View File

@ -165,8 +165,7 @@ impl<'a> From<&'a str> for ContentEncoding {
"br" => ContentEncoding::Br, "br" => ContentEncoding::Br,
"gzip" => ContentEncoding::Gzip, "gzip" => ContentEncoding::Gzip,
"deflate" => ContentEncoding::Deflate, "deflate" => ContentEncoding::Deflate,
"identity" => ContentEncoding::Identity, _ => ContentEncoding::Identity,
_ => ContentEncoding::Auto,
} }
} }
} }

4
src/server/encoding.rs
View File

@ -466,8 +466,8 @@ impl ContentEncoder {
GzEncoder::new(transfer, Compression::default())), GzEncoder::new(transfer, Compression::default())),
ContentEncoding::Br => ContentEncoder::Br( ContentEncoding::Br => ContentEncoder::Br(
BrotliEncoder::new(transfer, 5)), BrotliEncoder::new(transfer, 5)),
ContentEncoding::Identity => ContentEncoder::Identity(transfer), ContentEncoding::Identity | ContentEncoding::Auto =>
ContentEncoding::Auto => unreachable!() ContentEncoder::Identity(transfer),
} }
} }