pin h2 to 0.3.0

2024-09-30 15:22:02 +00:00 · 2021-02-27 19:57:09 +00:00 · 2021-02-27 19:57:09 +00:00 · b95e1dda34
commit b95e1dda34
parent 8f2a97c6e3
9 changed files with 22 additions and 29 deletions
--- a/.github/workflows/upload-doc.yml
+++ b/.github/workflows/upload-doc.yml
@ -1,14 +1,12 @@
-name: Upload documentation
+name: Upload Documentation

 on:
  push:
-    branches:
-      - master
+    branches: [master]

 jobs:
  build:
    runs-on: ubuntu-latest
-    if: github.repository == 'actix/actix-web'

    steps:
      - uses: actions/checkout@v2
@ -20,14 +18,14 @@ jobs:
          profile: minimal
          override: true

-      - name: check build
+      - name: Build Docs
        uses: actions-rs/cargo@v1
        with:
          command: doc
          args: --workspace --all-features --no-deps

      - name: Tweak HTML
-        run: echo "<meta http-equiv=refresh content=0;url=os_balloon/index.html>" > target/doc/index.html
+        run: echo '<meta http-equiv="refresh" content="0;url=actix_web/index.html">' > target/doc/index.html

      - name: Deploy to GitHub Pages
        uses: JamesIves/github-pages-deploy-action@3.7.1
--- a/Cargo.toml
+++ b/Cargo.toml
@ -84,7 +84,7 @@ actix-rt = "2"
 actix-server = "2.0.0-beta.3"
 actix-service = "2.0.0-beta.4"
 actix-utils = "3.0.0-beta.2"
-actix-tls = { version = "3.0.0-beta.3", default-features = false, optional = true }
+actix-tls = { version = "3.0.0-beta.4", default-features = false, optional = true }

 actix-web-codegen = "0.5.0-beta.1"
 actix-http = "3.0.0-beta.3"
--- a/actix-http-test/Cargo.toml
+++ b/actix-http-test/Cargo.toml
@ -31,7 +31,7 @@ openssl = ["tls-openssl", "awc/openssl"]
 [dependencies]
 actix-service = "2.0.0-beta.4"
 actix-codec = "0.4.0-beta.1"
-actix-tls = "3.0.0-beta.3"
+actix-tls = "3.0.0-beta.4"
 actix-utils = "3.0.0-beta.2"
 actix-rt = "2"
 actix-server = "2.0.0-beta.3"
--- a/actix-http/Cargo.toml
+++ b/actix-http/Cargo.toml
@ -48,7 +48,7 @@ actix-service = "2.0.0-beta.4"
 actix-codec = "0.4.0-beta.1"
 actix-utils = "3.0.0-beta.2"
 actix-rt = "2"
-actix-tls = "3.0.0-beta.2"
+actix-tls = "3.0.0-beta.4"

 ahash = "0.7"
 base64 = "0.13"
@ -61,7 +61,7 @@ derive_more = "0.99.5"
 encoding_rs = "0.8"
 futures-core = { version = "0.3.7", default-features = false, features = ["alloc"] }
 futures-util = { version = "0.3.7", default-features = false, features = ["alloc", "sink"] }
-h2 = "0.3.0"
+h2 = "=0.3.0"
 http = "0.2.2"
 httparse = "1.3"
 itoa = "0.4"
@ -90,7 +90,7 @@ trust-dns-resolver = { version = "0.20.0", optional = true }
 [dev-dependencies]
 actix-server = "2.0.0-beta.3"
 actix-http-test = { version = "3.0.0-beta.2", features = ["openssl"] }
-actix-tls = { version = "3.0.0-beta.2", features = ["openssl"] }
+actix-tls = { version = "3.0.0-beta.4", features = ["openssl"] }
 criterion = "0.3"
 env_logger = "0.8"
 rcgen = "0.8"
--- a/actix-http/src/h1/service.rs
+++ b/actix-http/src/h1/service.rs
@ -94,10 +94,10 @@ mod openssl {
    use super::*;

    use actix_service::ServiceFactoryExt;
-    use actix_tls::accept::openssl::{Acceptor, SslAcceptor, SslError, SslStream};
+    use actix_tls::accept::openssl::{Acceptor, SslAcceptor, SslError, TlsStream};
    use actix_tls::accept::TlsError;

-    impl<S, B, X, U> H1Service<SslStream<TcpStream>, S, B, X, U>
+    impl<S, B, X, U> H1Service<TlsStream<TcpStream>, S, B, X, U>
    where
        S: ServiceFactory<Request, Config = ()>,
        S::Error: Into<Error>,
@ -108,7 +108,7 @@ mod openssl {
        X::Error: Into<Error>,
        X::InitError: fmt::Debug,
        U: ServiceFactory<
-            (Request, Framed<SslStream<TcpStream>, Codec>),
+            (Request, Framed<TlsStream<TcpStream>, Codec>),
            Config = (),
            Response = (),
        >,
@ -131,7 +131,7 @@ mod openssl {
                    .map_err(TlsError::Tls)
                    .map_init_err(|_| panic!()),
            )
-            .and_then(|io: SslStream<TcpStream>| {
+            .and_then(|io: TlsStream<TcpStream>| {
                let peer_addr = io.get_ref().peer_addr().ok();
                ready(Ok((io, peer_addr)))
            })
--- a/actix-http/src/h2/service.rs
+++ b/actix-http/src/h2/service.rs
@ -93,12 +93,12 @@ where
 #[cfg(feature = "openssl")]
 mod openssl {
    use actix_service::{fn_factory, fn_service, ServiceFactoryExt};
-    use actix_tls::accept::openssl::{Acceptor, SslAcceptor, SslError, SslStream};
+    use actix_tls::accept::openssl::{Acceptor, SslAcceptor, SslError, TlsStream};
    use actix_tls::accept::TlsError;

    use super::*;

-    impl<S, B> H2Service<SslStream<TcpStream>, S, B>
+    impl<S, B> H2Service<TlsStream<TcpStream>, S, B>
    where
        S: ServiceFactory<Request, Config = ()>,
        S::Error: Into<Error> + 'static,
@ -123,7 +123,7 @@ mod openssl {
                    .map_init_err(|_| panic!()),
            )
            .and_then(fn_factory(|| {
-                ok::<_, S::InitError>(fn_service(|io: SslStream<TcpStream>| {
+                ok::<_, S::InitError>(fn_service(|io: TlsStream<TcpStream>| {
                    let peer_addr = io.get_ref().peer_addr().ok();
                    ok((io, peer_addr))
                }))
--- a/actix-http/src/service.rs
+++ b/actix-http/src/service.rs
@ -185,10 +185,10 @@ where
 mod openssl {
    use super::*;
    use actix_service::ServiceFactoryExt;
-    use actix_tls::accept::openssl::{Acceptor, SslAcceptor, SslError, SslStream};
+    use actix_tls::accept::openssl::{Acceptor, SslAcceptor, SslError, TlsStream};
    use actix_tls::accept::TlsError;

-    impl<S, B, X, U> HttpService<SslStream<TcpStream>, S, B, X, U>
+    impl<S, B, X, U> HttpService<TlsStream<TcpStream>, S, B, X, U>
    where
        S: ServiceFactory<Request, Config = ()>,
        S::Error: Into<Error> + 'static,
@ -201,13 +201,13 @@ mod openssl {
        X::InitError: fmt::Debug,
        <X::Service as Service<Request>>::Future: 'static,
        U: ServiceFactory<
-            (Request, Framed<SslStream<TcpStream>, h1::Codec>),
+            (Request, Framed<TlsStream<TcpStream>, h1::Codec>),
            Config = (),
            Response = (),
        >,
        U::Error: fmt::Display + Into<Error>,
        U::InitError: fmt::Debug,
-        <U::Service as Service<(Request, Framed<SslStream<TcpStream>, h1::Codec>)>>::Future: 'static,
+        <U::Service as Service<(Request, Framed<TlsStream<TcpStream>, h1::Codec>)>>::Future: 'static,
    {
        /// Create openssl based service
        pub fn openssl(
@ -225,7 +225,7 @@ mod openssl {
                    .map_err(TlsError::Tls)
                    .map_init_err(|_| panic!()),
            )
-            .and_then(|io: SslStream<TcpStream>| async {
+            .and_then(|io: TlsStream<TcpStream>| async {
                let proto = if let Some(protos) = io.ssl().selected_alpn_protocol() {
                    if protos.windows(2).any(|window| window == b"h2") {
                        Protocol::Http2
--- a/awc/Cargo.toml
+++ b/awc/Cargo.toml
@ -76,7 +76,7 @@ actix-http = { version = "3.0.0-beta.3", features = ["openssl"] }
 actix-http-test = { version = "3.0.0-beta.2", features = ["openssl"] }
 actix-utils = "3.0.0-beta.1"
 actix-server = "2.0.0-beta.3"
-actix-tls = { version = "3.0.0-beta.3", features = ["openssl", "rustls"] }
+actix-tls = { version = "3.0.0-beta.4", features = ["openssl", "rustls"] }

 brotli2 = "0.3.2"
 flate2 = "1.0.13"
--- a/tests/test_server.rs
+++ b/tests/test_server.rs
@ -786,11 +786,6 @@ mod plus_rustls {

    #[actix_rt::test]
    async fn test_reading_deflate_encoding_large_random_rustls() {
-        use rustls::internal::pemfile::{certs, pkcs8_private_keys};
-        use rustls::{NoClientAuth, ServerConfig};
-        use std::fs::File;
-        use std::io::BufReader;
-
        let data = rand::thread_rng()
            .sample_iter(&Alphanumeric)
            .take(160_000)