awc,web: Bump up to next beta releases (#1638)

.github/workflows/bench.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@v2
 
       - name: Install Rust
         uses: actions-rs/toolchain@v1

.github/workflows/linux.yml

@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@v2
 
       - name: Install ${{ matrix.version }}
         uses: actions-rs/toolchain@v1

.github/workflows/macos.yml

@@ -20,7 +20,7 @@ jobs:
     runs-on: macOS-latest
 
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@v2
 
       - name: Install ${{ matrix.version }}
         uses: actions-rs/toolchain@v1

.github/workflows/upload-doc.yml

@@ -11,7 +11,7 @@ jobs:
     if: github.repository == 'actix/actix-web'
 
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@v2
 
       - name: Install Rust
         uses: actions-rs/toolchain@v1
@@ -29,7 +29,9 @@ jobs:
       - name: Tweak HTML
         run: echo "<meta http-equiv=refresh content=0;url=os_balloon/index.html>" > target/doc/index.html
 
-      - name: Upload documentation
-        run: |
-          git clone https://github.com/davisp/ghp-import.git
-          ./ghp-import/ghp_import.py -n -p -f -m "Documentation upload" -r https://${{ secrets.GITHUB_TOKEN }}@github.com/"${{ github.repository }}.git" target/doc
+      - name: Deploy to GitHub Pages
+        uses: JamesIves/github-pages-deploy-action@3.5.8
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          BRANCH: gh-pages
+          FOLDER: target/doc

.github/workflows/windows.yml

@@ -23,7 +23,7 @@ jobs:
     runs-on: windows-latest
 
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@v2
 
       - name: Install ${{ matrix.version }}
         uses: actions-rs/toolchain@v1

.gitignore

@@ -9,6 +9,7 @@ guide/build/
 *.pid
 *.sock
 *~
+.DS_Store
 
 # These are backup files generated by rustfmt
 **/*.rs.bk

CHANGES.md

@@ -1,11 +1,18 @@
 # Changes
 
-## Unreleased - 2020-xx-xx
+## 3.0.0-beta.3 - 2020-08-17
+### Changed
+* Update `rustls` to 0.18
+
+## 3.0.0-beta.2 - 2020-08-17
 ### Changed
 * `PayloadConfig` is now also considered in `Bytes` and `String` extractors when set
   using `App::data`. [#1610]
 * `web::Path` now has a public representation: `web::Path(pub T)` that enables
   destructuring. [#1594]
+* `ServiceRequest::app_data` allows retrieval of non-Data data without splitting into parts to
+  access `HttpRequest` which already allows this. [#1618]
+* Re-export all error types from `awc`. [#1621]
 * MSRV is now 1.42.0.
 
 ### Fixed
@@ -14,6 +21,8 @@
 [#1594]: https://github.com/actix/actix-web/pull/1594
 [#1609]: https://github.com/actix/actix-web/pull/1609
 [#1610]: https://github.com/actix/actix-web/pull/1610
+[#1618]: https://github.com/actix/actix-web/pull/1618
+[#1621]: https://github.com/actix/actix-web/pull/1621
 
 
 ## 3.0.0-beta.1 - 2020-07-13

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "actix-web"
-version = "3.0.0-beta.1"
+version = "3.0.0-beta.3"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Actix web is a simple, pragmatic and extremely fast web framework for Rust."
 readme = "README.md"
@@ -74,11 +74,11 @@ actix-server = "1.0.0"
 actix-testing = "1.0.0"
 actix-macros = "0.1.0"
 actix-threadpool = "0.3.1"
-actix-tls = "2.0.0-alpha.1"
+actix-tls = "2.0.0-alpha.2"
 
 actix-web-codegen = "0.3.0-beta.1"
-actix-http = "2.0.0-alpha.4"
-awc = { version = "2.0.0-beta.1", default-features = false }
+actix-http = "2.0.0-beta.3"
+awc = { version = "2.0.0-beta.3", default-features = false }
 
 bytes = "0.5.3"
 derive_more = "0.99.2"
@@ -98,7 +98,7 @@ serde_urlencoded = "0.6.1"
 time = { version = "0.2.7", default-features = false, features = ["std"] }
 url = "2.1"
 open-ssl = { package = "openssl", version = "0.10", optional = true }
-rust-tls = { package = "rustls", version = "0.17.0", optional = true }
+rust-tls = { package = "rustls", version = "0.18.0", optional = true }
 tinyvec = { version = "0.3", features = ["alloc"] }
 
 [dev-dependencies]
@@ -124,6 +124,10 @@ actix-files = { path = "actix-files" }
 actix-multipart = { path = "actix-multipart" }
 awc = { path = "awc" }
 
+[[example]]
+name = "client"
+required-features = ["rustls"]
+
 [[bench]]
 name = "server"
 harness = false

actix-files/Cargo.toml

@@ -17,8 +17,8 @@ name = "actix_files"
 path = "src/lib.rs"
 
 [dependencies]
-actix-web = { version = "3.0.0-beta.1", default-features = false }
-actix-http = "2.0.0-beta.1"
+actix-web = { version = "3.0.0-beta.3", default-features = false }
+actix-http = "2.0.0-beta.3"
 actix-service = "1.0.1"
 bitflags = "1"
 bytes = "0.5.3"
@@ -33,4 +33,4 @@ v_htmlescape = "0.10"
 
 [dev-dependencies]
 actix-rt = "1.0.0"
-actix-web = { version = "3.0.0-beta.1", features = ["openssl"] }
+actix-web = { version = "3.0.0-beta.3", features = ["openssl"] }

actix-http/CHANGES.md

@@ -1,9 +1,17 @@
 # Changes
 
-## Unreleased - 2020-xx-xx
+## Unreleased
 
 
-## 2.0.0-beta.2 - 2020-07-21
+## [2.0.0-beta.3] - 2020-08-14
+
+### Fixed
+* Memory leak of `client::pool::ConnectorPoolSupport`. [#1626]
+
+[#1626]: https://github.com/actix/actix-web/pull/1626
+
+
+## [2.0.0-beta.2] - 2020-07-21
 ### Fixed
 * Potential UB in h1 decoder using uninitialized memory. [#1614]
 

actix-http/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "actix-http"
-version = "2.0.0-beta.2"
+version = "2.0.0-beta.3"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Actix HTTP primitives"
 readme = "README.md"
@@ -42,11 +42,11 @@ actors = ["actix"]
 [dependencies]
 actix-service = "1.0.5"
 actix-codec = "0.2.0"
-actix-connect = "2.0.0-alpha.3"
+actix-connect = "2.0.0-alpha.4"
 actix-utils = "1.0.6"
 actix-rt = "1.0.0"
 actix-threadpool = "0.3.1"
-actix-tls = { version = "2.0.0-alpha.1", optional = true }
+actix-tls = { version = "2.0.0-alpha.2", optional = true }
 actix = { version = "0.10.0-alpha.1", optional = true }
 
 base64 = "0.12"
@@ -87,14 +87,14 @@ flate2 = { version = "1.0.13", optional = true }
 
 [dev-dependencies]
 actix-server = "1.0.1"
-actix-connect = { version = "2.0.0-alpha.2", features = ["openssl"] }
+actix-connect = { version = "2.0.0-alpha.4", features = ["openssl"] }
 actix-http-test = { version = "2.0.0-alpha.1", features = ["openssl"] }
-actix-tls = { version = "2.0.0-alpha.1", features = ["openssl"] }
+actix-tls = { version = "2.0.0-alpha.2", features = ["openssl"] }
 criterion = "0.3"
 env_logger = "0.7"
 serde_derive = "1.0"
 open-ssl = { version="0.10", package = "openssl" }
-rust-tls = { version="0.17", package = "rustls" }
+rust-tls = { version="0.18", package = "rustls" }
 
 [[bench]]
 name = "content-length"

actix-http/src/client/pool.rs

@@ -2,7 +2,7 @@ use std::cell::RefCell;
 use std::collections::VecDeque;
 use std::future::Future;
 use std::pin::Pin;
-use std::rc::{Rc, Weak};
+use std::rc::Rc;
 use std::task::{Context, Poll};
 use std::time::{Duration, Instant};
 
@@ -65,8 +65,8 @@ where
 
         // start support future
         actix_rt::spawn(ConnectorPoolSupport {
-            connector: connector_rc.clone(),
-            inner: Rc::downgrade(&inner_rc),
+            connector: Rc::clone(&connector_rc),
+            inner: Rc::clone(&inner_rc),
         });
 
         ConnectionPool(connector_rc, inner_rc)
@@ -82,6 +82,13 @@ where
     }
 }
 
+impl<T, Io> Drop for ConnectionPool<T, Io> {
+    fn drop(&mut self) {
+        // wake up the ConnectorPoolSupport when dropping so it can exit properly.
+        self.1.borrow().waker.wake();
+    }
+}
+
 impl<T, Io> Service for ConnectionPool<T, Io>
 where
     Io: AsyncRead + AsyncWrite + Unpin + 'static,
@@ -421,7 +428,7 @@ where
     Io: AsyncRead + AsyncWrite + Unpin + 'static,
 {
     connector: T,
-    inner: Weak<RefCell<Inner<Io>>>,
+    inner: Rc<RefCell<Inner<Io>>>,
 }
 
 impl<T, Io> Future for ConnectorPoolSupport<T, Io>
@@ -435,55 +442,57 @@ where
     fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         let this = self.project();
 
-        if let Some(this_inner) = this.inner.upgrade() {
-            let mut inner = this_inner.as_ref().borrow_mut();
-            inner.waker.register(cx.waker());
+        if Rc::strong_count(this.inner) == 1 {
+            // If we are last copy of Inner<Io> it means the ConnectionPool is already gone
+            // and we are safe to exit.
+            return Poll::Ready(());
+        }
 
-            // check waiters
-            loop {
-                let (key, token) = {
-                    if let Some((key, token)) = inner.waiters_queue.get_index(0) {
-                        (key.clone(), *token)
-                    } else {
-                        break;
-                    }
-                };
-                if inner.waiters.get(token).unwrap().is_none() {
-                    continue;
-                }
+        let mut inner = this.inner.borrow_mut();
+        inner.waker.register(cx.waker());
 
-                match inner.acquire(&key, cx) {
-                    Acquire::NotAvailable => break,
-                    Acquire::Acquired(io, created) => {
-                        let tx = inner.waiters.get_mut(token).unwrap().take().unwrap().1;
-                        if let Err(conn) = tx.send(Ok(IoConnection::new(
-                            io,
-                            created,
-                            Some(Acquired(key.clone(), Some(this_inner.clone()))),
-                        ))) {
-                            let (io, created) = conn.unwrap().into_inner();
-                            inner.release_conn(&key, io, created);
-                        }
-                    }
-                    Acquire::Available => {
-                        let (connect, tx) =
-                            inner.waiters.get_mut(token).unwrap().take().unwrap();
-                        OpenWaitingConnection::spawn(
-                            key.clone(),
-                            tx,
-                            this_inner.clone(),
-                            this.connector.call(connect),
-                            inner.config.clone(),
-                        );
-                    }
+        // check waiters
+        loop {
+            let (key, token) = {
+                if let Some((key, token)) = inner.waiters_queue.get_index(0) {
+                    (key.clone(), *token)
+                } else {
+                    break;
                 }
-                let _ = inner.waiters_queue.swap_remove_index(0);
+            };
+            if inner.waiters.get(token).unwrap().is_none() {
+                continue;
             }
 
-            Poll::Pending
-        } else {
-            Poll::Ready(())
+            match inner.acquire(&key, cx) {
+                Acquire::NotAvailable => break,
+                Acquire::Acquired(io, created) => {
+                    let tx = inner.waiters.get_mut(token).unwrap().take().unwrap().1;
+                    if let Err(conn) = tx.send(Ok(IoConnection::new(
+                        io,
+                        created,
+                        Some(Acquired(key.clone(), Some(this.inner.clone()))),
+                    ))) {
+                        let (io, created) = conn.unwrap().into_inner();
+                        inner.release_conn(&key, io, created);
+                    }
+                }
+                Acquire::Available => {
+                    let (connect, tx) =
+                        inner.waiters.get_mut(token).unwrap().take().unwrap();
+                    OpenWaitingConnection::spawn(
+                        key.clone(),
+                        tx,
+                        this.inner.clone(),
+                        this.connector.call(connect),
+                        inner.config.clone(),
+                    );
+                }
+            }
+            let _ = inner.waiters_queue.swap_remove_index(0);
         }
+
+        Poll::Pending
     }
 }
 

actix-multipart/Cargo.toml

@@ -16,7 +16,7 @@ name = "actix_multipart"
 path = "src/lib.rs"
 
 [dependencies]
-actix-web = { version = "3.0.0-beta.1", default-features = false }
+actix-web = { version = "3.0.0-beta.3", default-features = false }
 actix-service = "1.0.1"
 actix-utils = "1.0.3"
 bytes = "0.5.3"
@@ -29,4 +29,4 @@ twoway = "0.2"
 
 [dev-dependencies]
 actix-rt = "1.0.0"
-actix-http = "2.0.0-beta.1"
+actix-http = "2.0.0-beta.3"

actix-web-actors/Cargo.toml

@@ -17,8 +17,8 @@ path = "src/lib.rs"
 
 [dependencies]
 actix = "0.10.0-alpha.2"
-actix-web = { version = "3.0.0-beta.1", default-features = false }
-actix-http = "2.0.0-beta.1"
+actix-web = { version = "3.0.0-beta.3", default-features = false }
+actix-http = "2.0.0-beta.3"
 actix-codec = "0.2.0"
 bytes = "0.5.2"
 futures-channel = { version = "0.3.5", default-features = false }

actix-web-codegen/Cargo.toml

@@ -20,5 +20,5 @@ proc-macro2 = "1"
 
 [dev-dependencies]
 actix-rt = "1.0.0"
-actix-web = "3.0.0-beta.1"
+actix-web = "3.0.0-beta.3"
 futures-util = { version = "0.3.5", default-features = false }

awc/CHANGES.md

@@ -1,6 +1,8 @@
 # Changes
 
-## Unreleased - 2020-xx-xx
+## 2.0.0-beta.3 - 2020-08-17
+### Changed
+* Update `rustls` to 0.18
 
 
 ## 2.0.0-beta.2 - 2020-07-21

awc/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "awc"
-version = "2.0.0-beta.2"
+version = "2.0.0-beta.3"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Async HTTP client library that uses the Actix runtime."
 readme = "README.md"
@@ -39,7 +39,7 @@ compress = ["actix-http/compress"]
 [dependencies]
 actix-codec = "0.2.0"
 actix-service = "1.0.1"
-actix-http = "2.0.0-beta.2"
+actix-http = "2.0.0-beta.3"
 actix-rt = "1.0.0"
 
 base64 = "0.12"
@@ -54,16 +54,16 @@ serde = "1.0"
 serde_json = "1.0"
 serde_urlencoded = "0.6.1"
 open-ssl = { version = "0.10", package = "openssl", optional = true }
-rust-tls = { version = "0.17.0", package = "rustls", optional = true, features = ["dangerous_configuration"] }
+rust-tls = { version = "0.18.0", package = "rustls", optional = true, features = ["dangerous_configuration"] }
 
 [dev-dependencies]
-actix-connect = { version = "2.0.0-alpha.2", features = ["openssl"] }
-actix-web = { version = "3.0.0-alpha.3", features = ["openssl"] }
-actix-http = { version = "2.0.0-beta.2", features = ["openssl"] }
+actix-connect = { version = "2.0.0-alpha.4", features = ["openssl"] }
+actix-web = { version = "3.0.0-beta.3", features = ["openssl"] }
+actix-http = { version = "2.0.0-beta.3", features = ["openssl"] }
 actix-http-test = { version = "2.0.0-alpha.1", features = ["openssl"] }
 actix-utils = "1.0.3"
 actix-server = "1.0.0"
-actix-tls = { version = "2.0.0-alpha.1", features = ["openssl", "rustls"] }
+actix-tls = { version = "2.0.0-alpha.2", features = ["openssl", "rustls"] }
 brotli2 = "0.3.2"
 flate2 = "1.0.13"
 futures-util = { version = "0.3.5", default-features = false }

docs/graphs/.gitignore

@@ -0,0 +1,2 @@
+# do not track rendered graphs
+*.png

docs/graphs/dependency-graphs.md

@@ -0,0 +1,11 @@
+# Actix Ecosystem Dependency Graphs
+
+See rendered versions of these dot graphs [on the wiki](https://github.com/actix/actix-web/wiki/Dependency-Graph).
+
+## Rendering
+
+Dot graphs were rendered using the `dot` command from [GraphViz](https://www.graphviz.org/doc/info/command.html):
+
+```sh
+for f in $(ls docs/graphs/*.dot | xargs); do dot $f -Tpng -o${f:r}.png; done
+```

docs/graphs/net-only.dot

@@ -0,0 +1,25 @@
+digraph {
+    subgraph cluster_net {
+        label="actix/actix-net";
+        "actix-codec"
+        "actix-connect"
+        "actix-macros"
+        "actix-rt"
+        "actix-server"
+        "actix-service"
+        "actix-testing"
+        "actix-threadpool"
+        "actix-tls"
+        "actix-tracing"
+        "actix-utils"
+        "actix-router"
+    }
+
+    "actix-utils" -> { "actix-service" "actix-rt" "actix-codec" }
+    "actix-tracing" -> { "actix-service" }
+    "actix-tls" -> { "actix-service" "actix-codec" "actix-utils" "actix-rt" }
+    "actix-testing" -> { "actix-rt" "actix-macros" "actix-server" "actix-service" }
+    "actix-server" -> { "actix-service" "actix-rt" "actix-codec" "actix-utils" }
+    "actix-rt" -> { "actix-macros" "actix-threadpool" }
+    "actix-connect" -> { "actix-service" "actix-codec" "actix-utils" "actix-rt" }
+}

docs/graphs/web-focus.dot

@@ -0,0 +1,30 @@
+digraph {
+    subgraph cluster_web {
+        label="actix/actix-web"
+        "awc"
+        "actix-web"
+        "actix-files"
+        "actix-http"
+        "actix-multipart"
+        "actix-web-actors"
+        "actix-web-codegen"
+    }
+
+    "actix-web" -> { "actix-codec" "actix-service" "actix-utils" "actix-router" "actix-rt" "actix-server" "actix-testing" "actix-macros" "actix-threadpool" "actix-tls" "actix-web-codegen" "actix-http" "awc" }
+    "awc" -> { "actix-codec" "actix-service" "actix-http" "actix-rt" }
+    "actix-web-actors" -> { "actix" "actix-web" "actix-http" "actix-codec" }
+    "actix-multipart" -> { "actix-web" "actix-service" "actix-utils" }
+    "actix-http" -> { "actix-service" "actix-codec" "actix-connect" "actix-utils" "actix-rt" "actix-threadpool" }
+    "actix-http" -> { "actix" "actix-tls" }[color=blue] // optional
+    "actix-files" -> { "actix-web" "actix-http" }
+
+    // net
+
+    "actix-utils" -> { "actix-service" "actix-rt" "actix-codec" }
+    "actix-tracing" -> { "actix-service" }
+    "actix-tls" -> { "actix-service" "actix-codec" "actix-utils" "actix-rt" }
+    "actix-testing" -> { "actix-rt" "actix-macros" "actix-server" "actix-service" }
+    "actix-server" -> { "actix-service" "actix-rt" "actix-codec" "actix-utils" }
+    "actix-rt" -> { "actix-macros" "actix-threadpool" }
+    "actix-connect" -> { "actix-service" "actix-codec" "actix-utils" "actix-rt" }
+}

docs/graphs/web-only.dot

@@ -0,0 +1,19 @@
+digraph {
+    subgraph cluster_web {
+        label="actix/actix-web"
+        "awc"
+        "actix-web"
+        "actix-files"
+        "actix-http"
+        "actix-multipart"
+        "actix-web-actors"
+        "actix-web-codegen"
+    }
+
+    "actix-web" -> {  "actix-web-codegen" "actix-http" "awc" }
+    "awc" -> { "actix-http" }
+    "actix-web-actors" -> { "actix" "actix-web" "actix-http" }
+    "actix-multipart" -> { "actix-web" }
+    "actix-http" -> { "actix" }[color=blue] // optional
+    "actix-files" -> { "actix-web" "actix-http" }
+}

src/lib.rs

@@ -213,9 +213,7 @@ pub mod client {
     //! }
     //! ```
 
-    pub use awc::error::{
-        ConnectError, InvalidUrl, PayloadError, SendRequestError, WsClientError,
-    };
+    pub use awc::error::*;
     pub use awc::{
         test, Client, ClientBuilder, ClientRequest, ClientResponse, Connector,
     };

src/service.rs

@@ -12,7 +12,6 @@ use actix_router::{IntoPattern, Path, Resource, ResourceDef, Url};
 use actix_service::{IntoServiceFactory, ServiceFactory};
 
 use crate::config::{AppConfig, AppService};
-use crate::data::Data;
 use crate::dev::insert_slash;
 use crate::guard::Guard;
 use crate::info::ConnectionInfo;
@@ -226,12 +225,11 @@ impl ServiceRequest {
         self.0.app_config()
     }
 
-    /// Get an application data stored with `App::data()` method during
-    /// application configuration.
-    pub fn app_data<T: 'static>(&self) -> Option<Data<T>> {
+    /// Counterpart to [`HttpRequest::app_data`](../struct.HttpRequest.html#method.app_data).
+    pub fn app_data<T: 'static>(&self) -> Option<&T> {
         for container in (self.0).0.app_data.iter().rev() {
-            if let Some(data) = container.get::<Data<T>>() {
-                return Some(Data::clone(&data));
+            if let Some(data) = container.get::<T>() {
+                return Some(data);
             }
         }
 
@@ -595,6 +593,28 @@ mod tests {
         let resp = srv.call(req).await.unwrap();
         assert_eq!(resp.status(), http::StatusCode::NOT_FOUND);
     }
+
+    #[actix_rt::test]
+    async fn test_service_data() {
+        let mut srv = init_service(
+            App::new()
+                .data(42u32)
+                .service(web::service("/test").name("test").finish(
+                    |req: ServiceRequest| {
+                        assert_eq!(
+                            req.app_data::<web::Data<u32>>().unwrap().as_ref(),
+                            &42
+                        );
+                        ok(req.into_response(HttpResponse::Ok().finish()))
+                    },
+                )),
+        )
+        .await;
+        let req = TestRequest::with_uri("/test").to_request();
+        let resp = srv.call(req).await.unwrap();
+        assert_eq!(resp.status(), http::StatusCode::OK);
+    }
+
     #[test]
     fn test_fmt_debug() {
         let req = TestRequest::get()

test-server/Cargo.toml

@@ -31,12 +31,12 @@ openssl = ["open-ssl", "awc/openssl"]
 [dependencies]
 actix-service = "1.0.1"
 actix-codec = "0.2.0"
-actix-connect = "2.0.0-alpha.2"
+actix-connect = "2.0.0-alpha.4"
 actix-utils = "1.0.3"
 actix-rt = "1.0.0"
 actix-server = "1.0.0"
 actix-testing = "1.0.0"
-awc = "2.0.0-alpha.2"
+awc = "2.0.0-beta.3"
 
 base64 = "0.12"
 bytes = "0.5.3"
@@ -52,5 +52,5 @@ time = { version = "0.2.7", default-features = false, features = ["std"] }
 open-ssl = { version = "0.10", package = "openssl", optional = true }
 
 [dev-dependencies]
-actix-web = "3.0.0-alpha.3"
-actix-http = "2.0.0-beta.1"
+actix-web = "3.0.0-beta.3"
+actix-http = "2.0.0-beta.3"