fix dependencies

actix-files/Cargo.toml

@@ -30,3 +30,6 @@ mime = "0.3"
 mime_guess = "2.0.0-alpha"
 percent-encoding = "1.0"
 v_htmlescape = "0.4"
+
+[dev-dependencies]
+actix-web = { version = "1.0.2", features = ["flate2-zlib"] }

actix-framed/Cargo.toml

@@ -31,6 +31,6 @@ bytes = "0.4"
 futures = "0.1.25"
 log = "0.4"
 
-# [dev-dependencies]
+[dev-dependencies]
-# actix-http-test = "0.2.4"
+actix-http-test = "0.2.4"
-# actix-utils = "0.4.4"
+actix-utils = "0.4.4"

actix-http/Cargo.toml

@@ -44,10 +44,6 @@ fail = ["failure"]
 # support for secure cookies
 secure-cookies = ["ring"]
 
-# only for tests
-# dev-ssl = ["ssl", "actix-http-test/ssl", "actix-server/ssl"]
-# dev-rust-tls = ["rust-tls", "actix-http-test/rust-tls", "actix-server/rust-tls"]
-
 [dependencies]
 actix-service = "0.4.1"
 actix-codec = "0.1.2"
@@ -102,10 +98,8 @@ rustls = { version = "0.15.2", optional = true }
 webpki-roots = { version = "0.16", optional = true }
 chrono = "0.4.6"
 
-# [dev-dependencies]
+[dev-dependencies]
-# actix-rt = "0.2.2"
+actix-rt = "0.2.2"
-# actix-server = "0.6.0"
+actix-server = "0.6.0"
-# actix-http-test = "0.2.4"
+actix-http-test = { version = "0.2.4", features = ["rust-tls", "ssl"] }
-# env_logger = "0.6"
+env_logger = "0.6"
-# serde_derive = "1.0"
-# openssl = "0.10"

actix-http/src/client/connector.rs

@@ -237,10 +237,10 @@ where
             const H2: &[u8] = b"h2";
             #[cfg(feature = "ssl")]
             use actix_connect::ssl::OpensslConnector;
-            #[cfg(feature = "rustls")]
+            #[cfg(feature = "rust-tls")]
             use actix_connect::ssl::RustlsConnector;
             use actix_service::boxed::service;
-            #[cfg(feature = "rustls")]
+            #[cfg(feature = "rust-tls")]
             use rustls::Session;
 
             let ssl_service = TimeoutService::new(
@@ -269,7 +269,7 @@ where
                                 }
                             }),
                     ),
-                    #[cfg(feature = "rustls")]
+                    #[cfg(feature = "rust-tls")]
                     SslConnector::Rustls(ssl) => service(
                         RustlsConnector::service(ssl)
                             .map_err(ConnectError::from)

actix-http/tests/test_rustls_server.rs

@@ -12,11 +12,10 @@ use actix_service::{new_service_cfg, NewService};
 use bytes::{Bytes, BytesMut};
 use futures::future::{self, ok, Future};
 use futures::stream::{once, Stream};
-use rustls::NoClientAuth;
+use rustls::{NoClientAuth, ServerConfig as RustlsServerConfig, internal::pemfile::{certs, pkcs8_private_keys}};
 
 use std::fs::File;
 use std::io::{BufReader, Result};
-use std::sync::Arc;
 
 fn load_body<S>(stream: S) -> impl Future<Item = BytesMut, Error = PayloadError>
 where
@@ -29,9 +28,8 @@ where
 }
 
 fn ssl_acceptor<T: AsyncRead + AsyncWrite>() -> Result<RustlsAcceptor<T, ()>> {
-    use rustls::{ServerConfig, internal::pemfile::{certs, pkcs8}};
     // load ssl keys
-    let mut config = ServerConfig::new(NoClientAuth::new());
+    let mut config = RustlsServerConfig::new(NoClientAuth::new());
     let cert_file = &mut BufReader::new(File::open("tests/cert.pem").unwrap());
     let key_file = &mut BufReader::new(File::open("tests/key.pem").unwrap());
     let cert_chain = certs(cert_file).unwrap();

actix-http/tests/test_ssl_server.rs

@@ -29,10 +29,10 @@ fn ssl_acceptor<T: AsyncRead + AsyncWrite>() -> Result<OpensslAcceptor<T, ()>> {
     // load ssl keys
     let mut builder = SslAcceptor::mozilla_intermediate(SslMethod::tls()).unwrap();
     builder
-        .set_private_key_file("tests/key.pem", SslFiletype::PEM)
+        .set_private_key_file("../tests/key.pem", SslFiletype::PEM)
         .unwrap();
     builder
-        .set_certificate_chain_file("tests/cert.pem")
+        .set_certificate_chain_file("../tests/cert.pem")
         .unwrap();
     builder.set_alpn_select_callback(|_, protos| {
         const H2: &[u8] = b"\x02h2";

actix-identity/Cargo.toml

@@ -24,6 +24,6 @@ serde = "1.0"
 serde_json = "1.0"
 time = "0.1.42"
 
-# [dev-dependencies]
+[dev-dependencies]
-# actix-http = "0.2.3"
+actix-http = "0.2.3"
-# bytes = "0.4"
+bytes = "0.4"

actix-multipart/Cargo.toml

@@ -29,5 +29,5 @@ mime = "0.3"
 time = "0.1"
 twoway = "0.2"
 
-# [dev-dependencies]
+[dev-dependencies]
-# actix-http = "0.2.4"
+actix-http = "0.2.4"

actix-session/Cargo.toml

@@ -33,6 +33,3 @@ hashbrown = "0.5.0"
 serde = "1.0"
 serde_json = "1.0"
 time = "0.1.42"
-
-# [dev-dependencies]
-# actix-rt = "0.2.2"

actix-web-actors/Cargo.toml

@@ -25,6 +25,5 @@ actix-codec = "0.1.2"
 bytes = "0.4"
 futures = "0.1.25"
 
-# [dev-dependencies]
+[dev-dependencies]
-# env_logger = "0.6"
+actix-http-test = "0.2.4"
-# actix-http-test = { version = "0.2.4", features=["ssl"] }

actix-web-codegen/Cargo.toml

@@ -15,8 +15,8 @@ proc-macro = true
 quote = "0.6.12"
 syn = { version = "0.15.34", features = ["full", "parsing", "extra-traits"] }
 
-# [dev-dependencies]
+[dev-dependencies]
-# actix-web = { version = "1.0.0" }
+actix-web = "1.0.0"
-# actix-http = { version = "0.2.4", features=["ssl"] }
+actix-http = "0.2.4"
-# actix-http-test = { version = "0.2.0", features=["ssl"] }
+actix-http-test = "0.2.0"
-# futures = { version = "0.1" }
+futures = "0.1"

actix-web-codegen/tests/test_macro.rs

@@ -142,7 +142,7 @@ fn test_body() {
     assert!(response.status().is_success());
     assert_eq!(response.status(), http::StatusCode::NO_CONTENT);
 
-    let mut srv = TestServer::new(|| HttpService::new(App::new().service(auto_sync)));
+    // let mut srv = TestServer::new(|| HttpService::new(App::new().service(auto_sync)));
     let request = srv.request(http::Method::GET, srv.url("/test"));
     let response = srv.block_on(request.send()).unwrap();
     assert!(response.status().is_success());

awc/Cargo.toml

@@ -41,10 +41,6 @@ flate2-zlib = ["actix-http/flate2-zlib"]
 # rust backend for flate2 crate
 flate2-rust = ["actix-http/flate2-rust"]
 
-# only for tests
-# dev-ssl = ["ssl", "actix-http-test/ssl", "actix-server/ssl", "actix-http/ssl"]
-# dev-rust-tls = ["rust-tls", "actix-http-test/rust-tls", "actix-server/rust-tls", "actix-http/rust-tls"]
-
 [dependencies]
 actix-codec = "0.1.2"
 actix-service = "0.4.1"
@@ -64,15 +60,11 @@ tokio-timer = "0.2.8"
 openssl = { version="0.10", optional = true }
 rustls = { version = "0.15.2", optional = true }
 
-# [dev-dependencies]
+[dev-dependencies]
-# actix-rt = "0.2.2"
+actix-rt = "0.2.2"
-# actix-web = "1.0.0"
+actix-web = "1.0.0"
-# actix-http-test = "0.2.0"
+actix-http-test = { version = "0.2.4", features = ["ssl", "rust-tls"] }
-# actix-utils = "0.4.1"
+actix-server = "0.6.0"
-# actix-server = "0.5.1"
+brotli2 = "0.3.2"
-# brotli2 = "0.3.2"
+flate2 = "1.0.2"
-# flate2 = "1.0.2"
+webpki = "0.19"
-# env_logger = "0.6"
-# rand = "0.7"
-# tokio-tcp = "0.1"
-# webpki = "0.19"

awc/tests/test_rustls_client.rs

@@ -1,5 +1,5 @@
-#![cfg(feature = "rustls")]
+#![cfg(feature = "rust-tls")]
-use rustls::{internal::pemfile, ClientConfig, NoClientAuth};
+use rustls::{internal::pemfile::{certs, pkcs8_private_keys}, ClientConfig, NoClientAuth};
 
 use std::fs::File;
 use std::io::{BufReader, Result};
@@ -7,7 +7,7 @@ use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::Arc;
 
 use actix_codec::{AsyncRead, AsyncWrite};
-use actix_http::HttpService;
+use actix_http::{HttpService, client::SslConnector::Rustls};
 use actix_http_test::TestServer;
 use actix_server::ssl::RustlsAcceptor;
 use actix_service::{service_fn, NewService};
@@ -15,11 +15,11 @@ use actix_web::http::Version;
 use actix_web::{web, App, HttpResponse};
 
 fn ssl_acceptor<T: AsyncRead + AsyncWrite>() -> Result<RustlsAcceptor<T, ()>> {
-    use rustls::{ServerConfig, internal::pemfile::{certs, pkcs8}};
+    use rustls::{ServerConfig};
     // load ssl keys
     let mut config = ServerConfig::new(NoClientAuth::new());
-    let cert_file = &mut BufReader::new(File::open("tests/cert.pem").unwrap());
+    let cert_file = &mut BufReader::new(File::open("../tests/cert.pem").unwrap());
-    let key_file = &mut BufReader::new(File::open("tests/key.pem").unwrap());
+    let key_file = &mut BufReader::new(File::open("../tests/key.pem").unwrap());
     let cert_chain = certs(cert_file).unwrap();
     let mut keys = pkcs8_private_keys(key_file).unwrap();
     config.set_single_cert(cert_chain, keys.remove(0)).unwrap();
@@ -66,8 +66,6 @@ fn test_connection_reuse_h2() {
     });
 
     // disable ssl verification
-    // use rustls::ssl::{SslConnector, SslMethod, SslVerifyMode};
-
     let mut config = ClientConfig::new();
     let protos = vec![b"h2".to_vec(), b"http/1.1".to_vec()];
     config.set_protocols(&protos);
@@ -76,7 +74,7 @@ fn test_connection_reuse_h2() {
         .set_certificate_verifier(Arc::new(danger::NoCertificateVerification {}));
 
     let client = awc::Client::build()
-        .connector(awc::Connector::new().ssl(Arc::new(config)).finish())
+        .connector(awc::Connector::new().ssl(Rustls(Arc::new(config))).finish())
         .finish();
 
     // req 1

awc/tests/test_ssl_client.rs

@@ -6,7 +6,7 @@ use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::Arc;
 
 use actix_codec::{AsyncRead, AsyncWrite};
-use actix_http::HttpService;
+use actix_http::{HttpService, client::SslConnector::Openssl};
 use actix_http_test::TestServer;
 use actix_server::ssl::OpensslAcceptor;
 use actix_service::{service_fn, NewService};
@@ -67,7 +67,7 @@ fn test_connection_reuse_h2() {
         .map_err(|e| log::error!("Can not set alpn protocol: {:?}", e));
 
     let client = awc::Client::build()
-        .connector(awc::Connector::new().ssl(builder.build()).finish())
+        .connector(awc::Connector::new().ssl(Openssl(builder.build())).finish())
         .finish();
 
     // req 1

test-server/Cargo.toml

@@ -33,7 +33,7 @@ rust-tls = ["rustls", "webpki", "actix-server/rust-tls", "awc/rust-tls", "actix-
 [dependencies]
 actix-codec = "0.1.2"
 actix-connect = "0.2"
-actix-rt = "0.2.2"
+actix-rt = "0.2.4"
 actix-service = "0.4.1"
 actix-server = "0.6.0"
 actix-utils = "0.4.1"
@@ -58,3 +58,7 @@ tokio-timer = "0.2"
 openssl = { version="0.10", optional = true }
 rustls = { version = "0.15.2", optional = true, features = ["dangerous_configuration"] }
 webpki = { version = "0.19", optional = true }
+
+[dev-dependencies]
+actix-web = "1.0.0"
+actix-http = "0.2.7"