Merge branch 'master' into refactor/actix_http_client

.github/workflows/ci.yml

@@ -26,6 +26,21 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
+      # install OpenSSL on Windows
+      - name: Set vcpkg root
+        if: matrix.target.triple == 'x86_64-pc-windows-msvc'
+        run: echo "VCPKG_ROOT=$env:VCPKG_INSTALLATION_ROOT" | Out-File -FilePath $env:GITHUB_ENV -Append
+      - name: Install OpenSSL
+        if: matrix.target.triple == 'x86_64-pc-windows-msvc'
+        run: vcpkg install openssl:x64-windows
+
+      - name: Install ${{ matrix.version }}
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: ${{ matrix.version }}-${{ matrix.target.triple }}
+          profile: minimal
+          override: true
+
       - name: Install ${{ matrix.version }}
         uses: actions-rs/toolchain@v1
         with:

Cargo.toml

@@ -111,12 +111,6 @@ tls-openssl = { package = "openssl", version = "0.10.9", optional = true }
 tls-rustls = { package = "rustls", version = "0.19.0", optional = true }
 url = "2.1"
 
-[target.'cfg(windows)'.dependencies.tls-openssl]
-version = "0.10.9"
-package = "openssl"
-features = ["vendored"]
-optional = true
-
 [dev-dependencies]
 brotli2 = "0.3.2"
 criterion = "0.3"

actix-http-test/Cargo.toml

@@ -50,12 +50,6 @@ serde_urlencoded = "0.7"
 time = { version = "0.2.23", default-features = false, features = ["std"] }
 tls-openssl = { version = "0.10.9", package = "openssl", optional = true }
 
-[target.'cfg(windows)'.dependencies.tls-openssl]
-version = "0.10.9"
-package = "openssl"
-features = ["vendored"]
-optional = true
-
 [dev-dependencies]
 actix-web = { version = "4.0.0-beta.4", default-features = false, features = ["cookies"] }
 actix-http = "3.0.0-beta.4"

actix-http/Cargo.toml

@@ -98,11 +98,6 @@ serde_derive = "1.0"
 tls-openssl = { version = "0.10", package = "openssl" }
 tls-rustls = { version = "0.19", package = "rustls" }
 
-[target.'cfg(windows)'.dev-dependencies.tls-openssl]
-version = "0.10.9"
-package = "openssl"
-features = ["vendored"]
-
 [[example]]
 name = "ws"
 required-features = ["rustls"]

actix-http/examples/echo.rs

@@ -3,7 +3,7 @@ use std::{env, io};
 use actix_http::{Error, HttpService, Request, Response};
 use actix_server::Server;
 use bytes::BytesMut;
-use futures_util::StreamExt;
+use futures_util::StreamExt as _;
 use http::header::HeaderValue;
 use log::info;
 

actix-http/examples/echo2.rs

@@ -4,7 +4,7 @@ use actix_http::http::HeaderValue;
 use actix_http::{Error, HttpService, Request, Response};
 use actix_server::Server;
 use bytes::BytesMut;
-use futures_util::StreamExt;
+use futures_util::StreamExt as _;
 use log::info;
 
 async fn handle_request(mut req: Request) -> Result<Response, Error> {

actix-http/src/client/h1proto.rs

@@ -8,7 +8,7 @@ use actix_codec::Framed;
 use bytes::buf::BufMut;
 use bytes::{Bytes, BytesMut};
 use futures_core::Stream;
-use futures_util::{future::poll_fn, SinkExt};
+use futures_util::{future::poll_fn, SinkExt as _};
 
 use crate::error::PayloadError;
 use crate::h1;
@@ -189,7 +189,7 @@ where
         }
     }
 
-    SinkExt::flush(framed.get_mut()).await?;
+    framed.get_mut().flush().await?;
     Ok(())
 }
 

actix-http/src/h2/dispatcher.rs

@@ -5,8 +5,10 @@ use actix_codec::{AsyncRead, AsyncWrite};
 use actix_service::Service;
 use bytes::{Bytes, BytesMut};
 use futures_core::ready;
-use h2::server::{Connection, SendResponse};
+use h2::{
-use h2::SendStream;
+    server::{Connection, SendResponse},
+    SendStream,
+};
 use http::header::{HeaderValue, CONNECTION, CONTENT_LENGTH, DATE, TRANSFER_ENCODING};
 use log::{error, trace};
 

actix-http/src/h2/service.rs

@@ -13,7 +13,7 @@ use actix_service::{
 use bytes::Bytes;
 use futures_core::ready;
 use futures_util::future::ok;
-use h2::server::{self, Handshake};
+use h2::server::{handshake, Handshake};
 use log::error;
 
 use crate::body::MessageBody;
@@ -307,7 +307,7 @@ where
                 Some(self.cfg.clone()),
                 addr,
                 on_connect_data,
-                server::handshake(io),
+                handshake(io),
             ),
         }
     }

actix-http/src/service.rs

@@ -1,14 +1,19 @@
-use std::marker::PhantomData;
+use std::{
-use std::pin::Pin;
+    fmt,
-use std::task::{Context, Poll};
+    future::Future,
-use std::{fmt, net, rc::Rc};
+    marker::PhantomData,
+    net,
+    pin::Pin,
+    rc::Rc,
+    task::{Context, Poll},
+};
 
 use actix_codec::{AsyncRead, AsyncWrite, Framed};
 use actix_rt::net::TcpStream;
 use actix_service::{pipeline_factory, IntoServiceFactory, Service, ServiceFactory};
 use bytes::Bytes;
-use futures_core::{ready, Future};
+use futures_core::ready;
-use h2::server::{self, Handshake};
+use h2::server::{handshake, Handshake};
 use pin_project::pin_project;
 
 use crate::body::MessageBody;
@@ -562,7 +567,7 @@ where
         match proto {
             Protocol::Http2 => HttpServiceHandlerResponse {
                 state: State::H2Handshake(Some((
-                    server::handshake(io),
+                    handshake(io),
                     self.cfg.clone(),
                     self.flow.clone(),
                     on_connect_data,

actix-http/src/time_parser.rs

@@ -1,7 +1,7 @@
 use time::{Date, OffsetDateTime, PrimitiveDateTime};
 
 /// Attempt to parse a `time` string as one of either RFC 1123, RFC 850, or asctime.
-pub fn parse_http_date(time: &str) -> Option<PrimitiveDateTime> {
+pub(crate) fn parse_http_date(time: &str) -> Option<PrimitiveDateTime> {
     try_parse_rfc_1123(time)
         .or_else(|| try_parse_rfc_850(time))
         .or_else(|| try_parse_asctime(time))

actix-http/tests/test_client.rs

@@ -6,7 +6,7 @@ use actix_service::ServiceFactoryExt;
 use bytes::Bytes;
 use futures_util::{
     future::{self, ok},
-    StreamExt,
+    StreamExt as _,
 };
 
 const STR: &str = "Hello World Hello World Hello World Hello World Hello World \

actix-http/tests/test_openssl.rs

@@ -12,8 +12,11 @@ use actix_http::{body, Error, HttpService, Request, Response};
 use actix_http_test::test_server;
 use actix_service::{fn_service, ServiceFactoryExt};
 use bytes::{Bytes, BytesMut};
-use futures_util::future::{err, ok, ready};
+use futures_core::Stream;
-use futures_util::stream::{once, Stream, StreamExt};
+use futures_util::{
+    future::{err, ok, ready},
+    stream::{once, StreamExt as _},
+};
 use openssl::{
     pkey::PKey,
     ssl::{SslAcceptor, SslMethod},

actix-http/tests/test_rustls.rs

@@ -10,8 +10,9 @@ use actix_http_test::test_server;
 use actix_service::{fn_factory_with_config, fn_service};
 
 use bytes::{Bytes, BytesMut};
+use futures_core::Stream;
 use futures_util::future::{self, err, ok};
-use futures_util::stream::{once, Stream, StreamExt};
+use futures_util::stream::{once, StreamExt as _};
 use rustls::{
     internal::pemfile::{certs, pkcs8_private_keys},
     NoClientAuth, ServerConfig as RustlsServerConfig,

actix-http/tests/test_server.rs

@@ -7,7 +7,7 @@ use actix_rt::time::sleep;
 use actix_service::fn_service;
 use bytes::Bytes;
 use futures_util::future::{self, err, ok, ready, FutureExt};
-use futures_util::stream::{once, StreamExt};
+use futures_util::stream::{once, StreamExt as _};
 use regex::Regex;
 
 use actix_http::HttpMessage;

actix-http/tests/test_ws.rs

@@ -12,7 +12,7 @@ use actix_utils::dispatcher::Dispatcher;
 use bytes::Bytes;
 use futures_util::future;
 use futures_util::task::{Context, Poll};
-use futures_util::{SinkExt, StreamExt};
+use futures_util::{SinkExt as _, StreamExt as _};
 
 struct WsService<T>(Arc<Mutex<(PhantomData<T>, Cell<bool>)>>);
 

awc/Cargo.toml

@@ -66,12 +66,6 @@ serde_urlencoded = "0.7"
 tls-openssl = { version = "0.10.9", package = "openssl", optional = true }
 tls-rustls = { version = "0.19.0", package = "rustls", optional = true, features = ["dangerous_configuration"] }
 
-[target.'cfg(windows)'.dependencies.tls-openssl]
-version = "0.10.9"
-package = "openssl"
-features = ["vendored"]
-optional = true
-
 [dev-dependencies]
 actix-web = { version = "4.0.0-beta.4", features = ["openssl"] }
 actix-http = { version = "3.0.0-beta.4", features = ["openssl"] }