From 2477afcf309da0fa16df113054c18fd2b1960c59 Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Tue, 24 Apr 2018 09:29:15 -0700
Subject: [PATCH] Allow to use rust backend for flate2 crate #199

---
 CHANGES.md |  3 ++-
 Cargo.toml | 10 ++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index ca1581f50..f86a05d47 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,9 +1,10 @@
 # Changes
 
-## 0.5.5 (2018-04-xx)
+## 0.5.5 (2018-04-24)
 
 * Fix panic when Websocket is closed with no error code #191
 
+* Allow to use rust backend for flate2 crate #199
 
 ## 0.5.4 (2018-04-19)
 
diff --git a/Cargo.toml b/Cargo.toml
index 78c0d723b..1a7c13875 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -26,7 +26,7 @@ name = "actix_web"
 path = "src/lib.rs"
 
 [features]
-default = ["session", "brotli"]
+default = ["session", "brotli", "flate2-c"]
 
 # tls
 tls = ["native-tls", "tokio-tls"]
@@ -40,13 +40,18 @@ session = ["cookie/secure"]
 # brotli encoding
 brotli = ["brotli2"]
 
+# miniz-sys backend for flate2 crate
+flate2-c = ["flate2/miniz-sys"]
+
+# rust-backend for flate2 crate
+flate2-rust = ["flate2/rust_backend"]
+
 [dependencies]
 actix = "^0.5.5"
 
 base64 = "0.9"
 bitflags = "1.0"
 failure = "0.1.1"
-flate2 = "1.0"
 h2 = "0.1"
 http = "^0.1.5"
 httparse = "1.2"
@@ -71,6 +76,7 @@ lazy_static = "1.0"
 url = { version="1.7", features=["query_encoding"] }
 cookie = { version="0.10", features=["percent-encode"] }
 brotli2 = { version="^0.3.2", optional = true }
+flate2 = { version="1.0", default-features = false }
 
 # io
 mio = "^0.6.13"