From cee914225780c9102d8c4a95300702043a632083 Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Sun, 12 May 2019 11:58:26 -0700
Subject: [PATCH] upgrade actix-web

---
 actix_redis/Cargo.toml        | 2 +-
 actix_todo/Cargo.toml         | 6 +++---
 async_db/Cargo.toml           | 2 +-
 async_ex2/Cargo.toml          | 4 ++--
 basics/Cargo.toml             | 6 +++---
 cookie-auth/Cargo.toml        | 2 +-
 cookie-session/Cargo.toml     | 4 ++--
 diesel/Cargo.toml             | 2 +-
 error_handling/Cargo.toml     | 2 +-
 form/Cargo.toml               | 2 +-
 hello-world/Cargo.toml        | 2 +-
 http-full-proxy/Cargo.toml    | 2 +-
 http-full-proxy/src/main.rs   | 1 +
 http-proxy/Cargo.toml         | 2 +-
 json/Cargo.toml               | 2 +-
 jsonrpc/Cargo.toml            | 2 +-
 juniper/Cargo.toml            | 2 +-
 middleware/Cargo.toml         | 4 ++--
 multipart/Cargo.toml          | 4 ++--
 protobuf/Cargo.toml           | 2 +-
 r2d2/Cargo.toml               | 2 +-
 redis-session/Cargo.toml      | 4 ++--
 rustls/Cargo.toml             | 4 ++--
 simple-auth-server/Cargo.toml | 4 ++--
 state/Cargo.toml              | 2 +-
 static_index/Cargo.toml       | 4 ++--
 template_askama/Cargo.toml    | 2 +-
 template_tera/Cargo.toml      | 2 +-
 template_yarte/Cargo.toml     | 6 +++---
 tls/Cargo.toml                | 2 +-
 web-cors/backend/Cargo.toml   | 2 +-
 websocket-chat/Cargo.toml     | 6 +++---
 websocket-tcp-chat/Cargo.toml | 6 +++---
 websocket/Cargo.toml          | 6 +++---
 34 files changed, 54 insertions(+), 53 deletions(-)

diff --git a/actix_redis/Cargo.toml b/actix_redis/Cargo.toml
index bbc6f438..72140b66 100644
--- a/actix_redis/Cargo.toml
+++ b/actix_redis/Cargo.toml
@@ -7,7 +7,7 @@ workspace = ".."
 
 [dependencies]
 actix = "0.8.1"
-actix-web = "1.0.0-beta.3"
+actix-web = "1.0.0-beta.4"
 actix-redis = { git="https://github.com/actix/actix-redis.git" }
 futures = "0.1.23"
 redis-async = "0.4.0"
diff --git a/actix_todo/Cargo.toml b/actix_todo/Cargo.toml
index 3fae6884..f7b70adc 100644
--- a/actix_todo/Cargo.toml
+++ b/actix_todo/Cargo.toml
@@ -6,9 +6,9 @@ workspace = ".."
 edition = "2018"
 
 [dependencies]
-actix-web = "1.0.0-beta.3"
-actix-files = "0.1.0-beta.1"
-actix-session = "0.1.0-beta.2"
+actix-web = "1.0.0-beta.5"
+actix-files = "0.1.0-beta.4"
+actix-session = "0.1.0-beta.4"
 dotenv = "0.13.0"
 env_logger = "0.5.10"
 futures = "0.1.22"
diff --git a/async_db/Cargo.toml b/async_db/Cargo.toml
index 3c73fc49..16121158 100644
--- a/async_db/Cargo.toml
+++ b/async_db/Cargo.toml
@@ -7,7 +7,7 @@ workspace = ".."
 
 [dependencies]
 actix-rt = "0.2"
-actix-web = "1.0.0-beta.3"
+actix-web = "1.0.0-beta.4"
 
 dotenv = "0.10"
 env_logger = "0.5"
diff --git a/async_ex2/Cargo.toml b/async_ex2/Cargo.toml
index 6a0f0a4e..0d7dab09 100644
--- a/async_ex2/Cargo.toml
+++ b/async_ex2/Cargo.toml
@@ -7,9 +7,9 @@ workspace = ".."
 
 [dependencies]
 actix-rt = "0.2.2"
-actix-web = { version="1.0.0-beta.1", features=["ssl"] }
+actix-web = { version="1.0.0-beta.4", features=["ssl"] }
 actix-multipart = "0.1.0-beta.1"
-actix-service = "0.3.6"
+actix-service = "0.4.0"
 bytes = "0.4.12"
 env_logger = "0.6.1"
 futures = "0.1"
diff --git a/basics/Cargo.toml b/basics/Cargo.toml
index 2a27e7c6..6f200774 100644
--- a/basics/Cargo.toml
+++ b/basics/Cargo.toml
@@ -7,9 +7,9 @@ edition = "2018"
 
 [dependencies]
 actix-rt = "0.2"
-actix-web = "1.0.0-beta.3"
-actix-files = "0.1.0-beta.1"
-actix-session = "0.1.0-beta.2"
+actix-web = "1.0.0-beta.4"
+actix-files = "0.1.0-beta.4"
+actix-session = "0.1.0-beta.4"
 
 futures = "0.1.25"
 env_logger = "0.5"
diff --git a/cookie-auth/Cargo.toml b/cookie-auth/Cargo.toml
index 34897fd8..8024c93d 100644
--- a/cookie-auth/Cargo.toml
+++ b/cookie-auth/Cargo.toml
@@ -6,5 +6,5 @@ edition = "2018"
 workspace = ".."
 
 [dependencies]
-actix-web = "1.0.0-beta.3"
+actix-web = "1.0.0-beta.4"
 env_logger = "0.6"
diff --git a/cookie-session/Cargo.toml b/cookie-session/Cargo.toml
index ed47386c..0d926be8 100644
--- a/cookie-session/Cargo.toml
+++ b/cookie-session/Cargo.toml
@@ -6,8 +6,8 @@ workspace = ".."
 edition = "2018"
 
 [dependencies]
-actix-web = "1.0.0-beta.3"
-actix-session = "0.1.0-beta.2"
+actix-web = "1.0.0-beta.4"
+actix-session = "0.1.0-beta.4"
 
 futures = "0.1"
 time = "0.1"
diff --git a/diesel/Cargo.toml b/diesel/Cargo.toml
index 47237609..3bc1e55b 100644
--- a/diesel/Cargo.toml
+++ b/diesel/Cargo.toml
@@ -6,7 +6,7 @@ workspace = ".."
 edition = "2018"
 
 [dependencies]
-actix-web = "1.0.0-beta.3"
+actix-web = "1.0.0-beta.4"
 
 bytes = "0.4"
 env_logger = "0.6"
diff --git a/error_handling/Cargo.toml b/error_handling/Cargo.toml
index ef3c168f..e892153f 100644
--- a/error_handling/Cargo.toml
+++ b/error_handling/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 workspace = ".."
 
 [dependencies]
-actix-web = "1.0.0-beta.3"
+actix-web = "1.0.0-beta.4"
 
 derive_more = "0.14.0"
 futures = "0.1.23"
diff --git a/form/Cargo.toml b/form/Cargo.toml
index c2fdcbfa..ed9467dc 100644
--- a/form/Cargo.toml
+++ b/form/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 workspace = ".."
 
 [dependencies]
-actix-web = "1.0.0-beta.3"
+actix-web = "1.0.0-beta.4"
 
 serde = "1.0"
 serde_derive = "1.0"
diff --git a/hello-world/Cargo.toml b/hello-world/Cargo.toml
index 8176a1fc..59ea15e8 100644
--- a/hello-world/Cargo.toml
+++ b/hello-world/Cargo.toml
@@ -6,5 +6,5 @@ workspace = ".."
 edition = "2018"
 
 [dependencies]
-actix-web = "1.0.0-beta.3"
+actix-web = "1.0.0-beta.4"
 env_logger = "0.6"
diff --git a/http-full-proxy/Cargo.toml b/http-full-proxy/Cargo.toml
index 21383f37..a1939948 100644
--- a/http-full-proxy/Cargo.toml
+++ b/http-full-proxy/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2018"
 
 [dependencies]
 actix-rt = "0.2"
-actix-web = "1.0.0-beta.3"
+actix-web = "1.0.0-beta.4"
 
 clap = "2.32.0"
 futures = "0.1.25"
diff --git a/http-full-proxy/src/main.rs b/http-full-proxy/src/main.rs
index 9b137bba..68a7d815 100644
--- a/http-full-proxy/src/main.rs
+++ b/http-full-proxy/src/main.rs
@@ -87,6 +87,7 @@ fn main() -> std::io::Result<()> {
 
     HttpServer::new(move || {
         App::new()
+            .data(Client::new())
             .data(forward_url.clone())
             .wrap(middleware::Logger::default())
             .default_service(web::route().to_async(forward))
diff --git a/http-proxy/Cargo.toml b/http-proxy/Cargo.toml
index 5cb4a0e2..718a346b 100644
--- a/http-proxy/Cargo.toml
+++ b/http-proxy/Cargo.toml
@@ -15,7 +15,7 @@ path = "src/server.rs"
 
 [dependencies]
 actix-rt = "0.2"
-actix-web = "1.0.0-beta.3"
+actix-web = "1.0.0-beta.4"
 
 env_logger = "0.5"
 futures = "0.1"
diff --git a/json/Cargo.toml b/json/Cargo.toml
index 207cc609..7375e334 100644
--- a/json/Cargo.toml
+++ b/json/Cargo.toml
@@ -6,7 +6,7 @@ workspace = ".."
 edition = "2018"
 
 [dependencies]
-actix-web = "1.0.0-beta.3"
+actix-web = "1.0.0-beta.4"
 
 bytes = "0.4"
 futures = "0.1"
diff --git a/jsonrpc/Cargo.toml b/jsonrpc/Cargo.toml
index 720f44a7..8b5978ba 100644
--- a/jsonrpc/Cargo.toml
+++ b/jsonrpc/Cargo.toml
@@ -7,7 +7,7 @@ workspace = ".."
 
 [dependencies]
 actix = "0.8.1"
-actix-web = "1.0.0-beta.3"
+actix-web = "1.0.0-beta.4"
 env_logger = "0.6"
 futures = "0.1.23"
 futures-timer = "0.1"
diff --git a/juniper/Cargo.toml b/juniper/Cargo.toml
index 54c82588..0d6c0f79 100644
--- a/juniper/Cargo.toml
+++ b/juniper/Cargo.toml
@@ -6,7 +6,7 @@ workspace = ".."
 edition = "2018"
 
 [dependencies]
-actix-web = "1.0.0-beta.3"
+actix-web = "1.0.0-beta.4"
 env_logger = "0.6"
 futures = "0.1"
 serde = "1.0"
diff --git a/middleware/Cargo.toml b/middleware/Cargo.toml
index b17594fd..8b9334f4 100644
--- a/middleware/Cargo.toml
+++ b/middleware/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 workspace = ".."
 
 [dependencies]
-actix-service = "0.3.6"
-actix-web = "1.0.0-beta.3"
+actix-service = "0.4.0"
+actix-web = "1.0.0-beta.4"
 futures = "0.1.25"
 env_logger = "0.6"
\ No newline at end of file
diff --git a/multipart/Cargo.toml b/multipart/Cargo.toml
index 5fc3e2a8..4c909d41 100644
--- a/multipart/Cargo.toml
+++ b/multipart/Cargo.toml
@@ -10,8 +10,8 @@ name = "multipart"
 path = "src/main.rs"
 
 [dependencies]
-actix-web = "1.0.0-beta.3"
-actix-multipart = "0.1.0-beta.1"
+actix-web = "1.0.0-beta.4"
+actix-multipart = "0.1.0-beta.4"
 
 env_logger = "0.6"
 futures = "0.1.25"
diff --git a/protobuf/Cargo.toml b/protobuf/Cargo.toml
index c80df979..ed6c0c6b 100644
--- a/protobuf/Cargo.toml
+++ b/protobuf/Cargo.toml
@@ -13,4 +13,4 @@ derive_more = "0.14"
 prost = "0.2.0"
 prost-derive = "0.2.0"
 
-actix-web = "1.0.0-beta.3"
+actix-web = "1.0.0-beta.4"
diff --git a/r2d2/Cargo.toml b/r2d2/Cargo.toml
index f869e4e5..f57cdf85 100644
--- a/r2d2/Cargo.toml
+++ b/r2d2/Cargo.toml
@@ -7,7 +7,7 @@ workspace = ".."
 
 [dependencies]
 actix-rt = "0.2"
-actix-web = "1.0.0-beta.3"
+actix-web = "1.0.0-beta.4"
 
 futures = "0.1"
 env_logger = "0.6"
diff --git a/redis-session/Cargo.toml b/redis-session/Cargo.toml
index 19ac65aa..6e1181a9 100644
--- a/redis-session/Cargo.toml
+++ b/redis-session/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2018"
 
 [dependencies]
 actix = "0.8.1"
-actix-web = "1.0.0-beta.3"
-actix-session = "0.1.0-beta.2"
+actix-web = "1.0.0-beta.4"
+actix-session = "0.1.0-beta.4"
 actix-redis = { git = "https://github.com/actix/actix-redis.git", features = ["web"] }
 env_logger = "0.6"
diff --git a/rustls/Cargo.toml b/rustls/Cargo.toml
index 6abb0157..33d04e5a 100644
--- a/rustls/Cargo.toml
+++ b/rustls/Cargo.toml
@@ -12,5 +12,5 @@ path = "src/main.rs"
 [dependencies]
 env_logger = "0.5"
 rustls = "0.15"
-actix-web = { version = "1.0.0-alpha.4", features=["rust-tls"] }
-actix-files = "0.1.0-alpha.4"
+actix-web = { version = "1.0.0-beta.4", features=["rust-tls"] }
+actix-files = "0.1.0-beta.4"
diff --git a/simple-auth-server/Cargo.toml b/simple-auth-server/Cargo.toml
index ec815e94..dab0dc5c 100644
--- a/simple-auth-server/Cargo.toml
+++ b/simple-auth-server/Cargo.toml
@@ -8,8 +8,8 @@ workspace = ".."
 [dependencies]
 actix = { version = "0.8.1", features = ["http"] }
 actix-rt = "0.2.2"
-actix-web = "1.0.0-beta.3"
-actix-files = "0.1.0-beta.1"
+actix-web = "1.0.0-beta.4"
+actix-files = "0.1.0-beta.4"
 
 bcrypt = "0.2.1"
 chrono = { version = "0.4.6", features = ["serde"] }
diff --git a/state/Cargo.toml b/state/Cargo.toml
index b0be5565..62e83ad2 100644
--- a/state/Cargo.toml
+++ b/state/Cargo.toml
@@ -6,6 +6,6 @@ workspace = ".."
 edition = "2018"
 
 [dependencies]
-actix-web = "1.0.0-beta.3"
+actix-web = "1.0.0-beta.4"
 futures = "0.1.25"
 env_logger = "0.6"
diff --git a/static_index/Cargo.toml b/static_index/Cargo.toml
index a5153402..bac404db 100644
--- a/static_index/Cargo.toml
+++ b/static_index/Cargo.toml
@@ -9,5 +9,5 @@ edition = "2018"
 futures = "0.1"
 env_logger = "0.5"
 
-actix-web = "1.0.0-beta.3"
-actix-files = "0.1.0-beta.1"
+actix-web = "1.0.0-beta.4"
+actix-files = "0.1.0-beta.4"
diff --git a/template_askama/Cargo.toml b/template_askama/Cargo.toml
index 8cecb147..378098c5 100644
--- a/template_askama/Cargo.toml
+++ b/template_askama/Cargo.toml
@@ -6,7 +6,7 @@ workspace = ".."
 edition = "2018"
 
 [dependencies]
-actix-web = "1.0.0-beta.3"
+actix-web = "1.0.0-beta.4"
 env_logger = "0.6"
 askama = "0.8"
 
diff --git a/template_tera/Cargo.toml b/template_tera/Cargo.toml
index 5c00ba1d..b49959ca 100644
--- a/template_tera/Cargo.toml
+++ b/template_tera/Cargo.toml
@@ -8,4 +8,4 @@ edition = "2018"
 [dependencies]
 env_logger = "0.6"
 tera = "0.11"
-actix-web = "1.0.0-beta.3"
+actix-web = "1.0.0-beta.4"
diff --git a/template_yarte/Cargo.toml b/template_yarte/Cargo.toml
index 81d5e9cb..0c31b1f3 100644
--- a/template_yarte/Cargo.toml
+++ b/template_yarte/Cargo.toml
@@ -12,12 +12,12 @@ env_logger = "0.6"
 
 yarte = { version = "0.2", features=["with-actix-web"]  }
 
-actix-web = "1.0.0-beta.3"
+actix-web = "1.0.0-beta.4"
 
 [build-dependencies]
 yarte = { version = "0.2", features=["with-actix-web"]  }
 
 [dev-dependencies]
 bytes = "0.4"
-actix-http-test = "0.1.0"
-actix-http = "0.1.0"
+actix-http-test = "0.2.0"
+actix-http = "0.2.0"
diff --git a/tls/Cargo.toml b/tls/Cargo.toml
index 65302c68..7541ee45 100644
--- a/tls/Cargo.toml
+++ b/tls/Cargo.toml
@@ -11,6 +11,6 @@ path = "src/main.rs"
 
 [dependencies]
 actix-rt = "0.2"
-actix-web = { version="1.0.0-alpha.4", features=["ssl"] }
+actix-web = { version="1.0.0-beta.4", features=["ssl"] }
 env_logger = "0.6"
 openssl = { version="0.10" }
diff --git a/web-cors/backend/Cargo.toml b/web-cors/backend/Cargo.toml
index 39e779e4..9ca67022 100644
--- a/web-cors/backend/Cargo.toml
+++ b/web-cors/backend/Cargo.toml
@@ -6,7 +6,7 @@ workspace = "../../"
 edition = "2018"
 
 [dependencies]
-actix-web = "1.0.0-beta.3"
+actix-web = "1.0.0-beta.4"
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
diff --git a/websocket-chat/Cargo.toml b/websocket-chat/Cargo.toml
index fe62f8b7..73b5866d 100644
--- a/websocket-chat/Cargo.toml
+++ b/websocket-chat/Cargo.toml
@@ -11,9 +11,9 @@ path = "src/main.rs"
 
 [dependencies]
 actix = "0.8.1"
-actix-web = "1.0.0-beta.3"
-actix-web-actors = "1.0.0-alpha.3"
-actix-files = "0.1.0-beta.1"
+actix-web = "1.0.0-beta.4"
+actix-web-actors = "1.0.0-beta.4"
+actix-files = "0.1.0-beta.4"
 
 rand = "0.6"
 bytes = "0.4"
diff --git a/websocket-tcp-chat/Cargo.toml b/websocket-tcp-chat/Cargo.toml
index 330357f6..85755904 100644
--- a/websocket-tcp-chat/Cargo.toml
+++ b/websocket-tcp-chat/Cargo.toml
@@ -15,9 +15,9 @@ path = "src/client.rs"
 
 [dependencies]
 actix = "0.8.1"
-actix-web = "1.0.0-beta.3"
-actix-web-actors = "1.0.0-alpha.3"
-actix-files = "0.1.0-beta.1"
+actix-web = "1.0.0-beta.4"
+actix-web-actors = "1.0.0-beta.4"
+actix-files = "0.1.0-beta.4"
 
 rand = "0.6"
 bytes = "0.4"
diff --git a/websocket/Cargo.toml b/websocket/Cargo.toml
index f4767c8e..89d64a80 100644
--- a/websocket/Cargo.toml
+++ b/websocket/Cargo.toml
@@ -15,9 +15,9 @@ path = "src/main.rs"
 
 [dependencies]
 actix = "0.8.1"
-actix-web = "1.0.0-beta.3"
-actix-web-actors = "1.0.0-alpha.3"
-actix-files = "0.1.0-beta.1"
+actix-web = "1.0.0-beta.4"
+actix-web-actors = "1.0.0-beta.4"
+actix-files = "0.1.0-beta.4"
 env_logger = "0.6"
 futures = "0.1"
 bytes = "0.4"
\ No newline at end of file