Merge pull request #73 from actix/master

-

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,12 +1,8 @@
 ## PR Type
 What kind of change does this PR make?
 
-<!-- Check the one that applies to this PR using "[x]". -->
-
-- [ ] Bug fix
-- [ ] Feature
-- [ ] Refactor / code style change (no functional or public API changes)
-- [ ] Other
+<!-- Bug Fix / Feature / Refactor / Code Style / Other -->
+INSERT_PR_TYPE
 
 
 ## PR Checklist

CHANGES.md

@@ -1,38 +1,32 @@
 # Changes
 
-## [Unreleased]
+## Unreleased - 2020-xx-xx
 
+
+## 3.0.0-beta.1 - 2020-07-13
 ### Added
-
 * Re-export `actix_rt::main` as `actix_web::main`.
 * `HttpRequest::match_pattern` and `ServiceRequest::match_pattern` for extracting the matched
   resource pattern.
 * `HttpRequest::match_name` and `ServiceRequest::match_name` for extracting matched resource name.
 
 ### Changed
-
 * Fix actix_http::h1::dispatcher so it returns when HW_BUFFER_SIZE is reached. Should reduce peak memory consumption during large uploads. [#1550]
 * Migrate cookie handling to `cookie` crate. Actix-web no longer requires `ring` dependency.
 * MSRV is now 1.41.1
 
 ### Fixed
-
 * `NormalizePath` improved consistency when path needs slashes added _and_ removed.
 
-## [3.0.0-alpha.3] - 2020-05-21
 
+## 3.0.0-alpha.3 - 2020-05-21
 ### Added
-
 * Add option to create `Data<T>` from `Arc<T>` [#1509]
 
 ### Changed
-
 * Resources and Scopes can now access non-overridden data types set on App (or containing scopes) when setting their own data. [#1486]
-
 * Fix audit issue logging by default peer address [#1485]
-
 * Bump minimum supported Rust version to 1.40
-
 * Replace deprecated `net2` crate with `socket2`
 
 [#1485]: https://github.com/actix/actix-web/pull/1485

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "actix-web"
-version = "3.0.0-alpha.3"
+version = "3.0.0-beta.1"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Actix web is a simple, pragmatic and extremely fast web framework for Rust."
 readme = "README.md"
@@ -11,7 +11,7 @@ documentation = "https://docs.rs/actix-web/"
 categories = ["network-programming", "asynchronous",
               "web-programming::http-server",
               "web-programming::websocket"]
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 edition = "2018"
 
 [package.metadata.docs.rs]
@@ -76,9 +76,9 @@ actix-macros = "0.1.0"
 actix-threadpool = "0.3.1"
 actix-tls = "2.0.0-alpha.1"
 
-actix-web-codegen = "0.2.2"
+actix-web-codegen = "0.3.0-beta.1"
 actix-http = "2.0.0-alpha.4"
-awc = { version = "2.0.0-alpha.2", default-features = false }
+awc = { version = "2.0.0-beta.1", default-features = false }
 
 bytes = "0.5.3"
 derive_more = "0.99.2"

actix-files/Cargo.toml

@@ -9,7 +9,7 @@ homepage = "https://actix.rs"
 repository = "https://github.com/actix/actix-web.git"
 documentation = "https://docs.rs/actix-files/"
 categories = ["asynchronous", "web-programming::http-server"]
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 edition = "2018"
 
 [lib]

actix-http/CHANGES.md

@@ -1,12 +1,19 @@
 # Changes
 
-## [Unreleased]
+## [Unreleased] - xxx
+
+## [2.0.0-beta.1] - 2020-07-11
 
 ### Changed
 
-* Migrate cookie handling to `cookie` crate.
-* Update `sha-1` to 0.9
-* MSRV is now 1.41.1
+* Migrate cookie handling to `cookie` crate. [#1558]
+* Update `sha-1` to 0.9. [#1586]
+* Fix leak in client pool. [#1580]
+* MSRV is now 1.41.1.
+
+[#1558]: https://github.com/actix/actix-web/pull/1558
+[#1586]: https://github.com/actix/actix-web/pull/1586
+[#1580]: https://github.com/actix/actix-web/pull/1580
 
 ## [2.0.0-alpha.4] - 2020-05-21
 

actix-http/Cargo.toml

@@ -1,8 +1,8 @@
 [package]
 name = "actix-http"
-version = "2.0.0-alpha.4"
+version = "2.0.0-beta.1"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
-description = "Actix http primitives"
+description = "Actix HTTP primitives"
 readme = "README.md"
 keywords = ["actix", "http", "framework", "async", "futures"]
 homepage = "https://actix.rs"
@@ -11,7 +11,7 @@ documentation = "https://docs.rs/actix-http/"
 categories = ["network-programming", "asynchronous",
               "web-programming::http-server",
               "web-programming::websocket"]
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 edition = "2018"
 
 [package.metadata.docs.rs]

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;
+use std::rc::{Rc, Weak};
 use std::task::{Context, Poll};
 use std::time::{Duration, Instant};
 
@@ -53,16 +53,25 @@ where
         + 'static,
 {
     pub(crate) fn new(connector: T, config: ConnectorConfig) -> Self {
-        ConnectionPool(
-            Rc::new(RefCell::new(connector)),
-            Rc::new(RefCell::new(Inner {
+        let connector_rc = Rc::new(RefCell::new(connector));
+        let inner_rc = Rc::new(RefCell::new(Inner {
             config,
             acquired: 0,
             waiters: Slab::new(),
             waiters_queue: IndexSet::new(),
             available: FxHashMap::default(),
             waker: LocalWaker::new(),
-            })),
+        }));
+
+        // start support future
+        actix_rt::spawn(ConnectorPoolSupport {
+            connector: connector_rc.clone(),
+            inner: Rc::downgrade(&inner_rc),
+        });
+
+        ConnectionPool(
+            connector_rc,
+            inner_rc,
         )
     }
 }
@@ -92,12 +101,6 @@ where
     }
 
     fn call(&mut self, req: Connect) -> Self::Future {
-        // start support future
-        actix_rt::spawn(ConnectorPoolSupport {
-            connector: self.0.clone(),
-            inner: self.1.clone(),
-        });
-
         let mut connector = self.0.clone();
         let inner = self.1.clone();
 
@@ -421,7 +424,7 @@ where
     Io: AsyncRead + AsyncWrite + Unpin + 'static,
 {
     connector: T,
-    inner: Rc<RefCell<Inner<Io>>>,
+    inner: Weak<RefCell<Inner<Io>>>,
 }
 
 impl<T, Io> Future for ConnectorPoolSupport<T, Io>
@@ -435,7 +438,8 @@ where
     fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         let this = self.project();
 
-        let mut inner = this.inner.as_ref().borrow_mut();
+        if let Some(this_inner) = this.inner.upgrade() {
+            let mut inner = this_inner.as_ref().borrow_mut();
             inner.waker.register(cx.waker());
 
             // check waiters
@@ -458,7 +462,7 @@ where
                         if let Err(conn) = tx.send(Ok(IoConnection::new(
                             io,
                             created,
-                        Some(Acquired(key.clone(), Some(this.inner.clone()))),
+                            Some(Acquired(key.clone(), Some(this_inner.clone()))),
                         ))) {
                             let (io, created) = conn.unwrap().into_inner();
                             inner.release_conn(&key, io, created);
@@ -470,7 +474,7 @@ where
                         OpenWaitingConnection::spawn(
                             key.clone(),
                             tx,
-                        this.inner.clone(),
+                            this_inner.clone(),
                             this.connector.call(connect),
                             inner.config.clone(),
                         );
@@ -480,6 +484,9 @@ where
             }
 
             Poll::Pending
+        } else {
+            Poll::Ready(())
+        }
     }
 }
 

actix-multipart/Cargo.toml

@@ -8,7 +8,7 @@ keywords = ["http", "web", "framework", "async", "futures"]
 homepage = "https://actix.rs"
 repository = "https://github.com/actix/actix-web.git"
 documentation = "https://docs.rs/actix-multipart/"
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 edition = "2018"
 
 [lib]

actix-web-actors/Cargo.toml

@@ -8,7 +8,7 @@ keywords = ["actix", "http", "web", "framework", "async"]
 homepage = "https://actix.rs"
 repository = "https://github.com/actix/actix-web.git"
 documentation = "https://docs.rs/actix-web-actors/"
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 edition = "2018"
 
 [lib]

actix-web-codegen/CHANGES.md

@@ -1,18 +1,20 @@
 # Changes
 
-## [Unreleased] - XXXX-XX-XX
+## Unreleased - 2020-xx-xx
 
-* Add main entry-point macro that uses re-exported runtime.
+
+## 0.3.0-beta.1 - 2020-07-14
+* Add main entry-point macro that uses re-exported runtime. [#1559]
+
+[#1559]: https://github.com/actix/actix-web/pull/1559
 
 
 ## [0.2.2] - 2020-05-23
-
 * Add resource middleware on actix-web-codegen [#1467]
 
 [#1467]: https://github.com/actix/actix-web/pull/1467
 
 ## [0.2.1] - 2020-02-25
-
 * Add `#[allow(missing_docs)]` attribute to generated structs [#1368]
 * Allow the handler function to be named as `config` [#1290]
 
@@ -26,7 +28,6 @@
 ## [0.1.3] - 2019-10-14
 
 * Bump up `syn` & `quote` to 1.0
-
 * Provide better error message
 
 ## [0.1.2] - 2019-06-04

actix-web-codegen/Cargo.toml

@@ -1,13 +1,13 @@
 [package]
 name = "actix-web-codegen"
-version = "0.2.2"
+version = "0.3.0-beta.1"
 description = "Actix web proc macros"
 readme = "README.md"
 homepage = "https://actix.rs"
 repository = "https://github.com/actix/actix-web"
 documentation = "https://docs.rs/actix-web-codegen"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 edition = "2018"
 
 [lib]
@@ -20,5 +20,5 @@ proc-macro2 = "1"
 
 [dev-dependencies]
 actix-rt = "1.0.0"
-actix-web = "3.0.0-alpha.3"
+actix-web = "3.0.0-beta.1"
 futures-util = { version = "0.3.5", default-features = false }

awc/CHANGES.md

@@ -1,5 +1,9 @@
 # Changes
 
+## [2.0.0-beta.1] - 2020-07-14
+### Changed
+* Update `actix-http` dependency to 2.0.0-beta.1
+
 ## [2.0.0-alpha.2] - 2020-05-21
 
 ### Changed

awc/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "awc"
-version = "2.0.0-alpha.2"
+version = "2.0.0-beta.1"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Actix http client."
 readme = "README.md"
@@ -11,7 +11,7 @@ documentation = "https://docs.rs/awc/"
 categories = ["network-programming", "asynchronous",
               "web-programming::http-client",
               "web-programming::websocket"]
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 edition = "2018"
 
 [lib]
@@ -36,7 +36,7 @@ compress = ["actix-http/compress"]
 [dependencies]
 actix-codec = "0.2.0"
 actix-service = "1.0.1"
-actix-http = "2.0.0-alpha.4"
+actix-http = "2.0.0-beta.1"
 actix-rt = "1.0.0"
 
 base64 = "0.12"
@@ -56,7 +56,7 @@ rust-tls = { version = "0.17.0", package = "rustls", optional = true, features =
 [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-alpha.4", features = ["openssl"] }
+actix-http = { version = "2.0.0-beta.1", features = ["openssl"] }
 actix-http-test = { version = "2.0.0-alpha.1", features = ["openssl"] }
 actix-utils = "1.0.3"
 actix-server = "1.0.0"

awc/src/request.rs

@@ -586,16 +586,16 @@ mod tests {
     use super::*;
     use crate::Client;
 
-    #[test]
-    fn test_debug() {
+    #[actix_rt::test]
+    async fn test_debug() {
         let request = Client::new().get("/").header("x-test", "111");
         let repr = format!("{:?}", request);
         assert!(repr.contains("ClientRequest"));
         assert!(repr.contains("x-test"));
     }
 
-    #[test]
-    fn test_basics() {
+    #[actix_rt::test]
+    async fn test_basics() {
         let mut req = Client::new()
             .put("/")
             .version(Version::HTTP_2)
@@ -621,8 +621,8 @@ mod tests {
         let _ = req.send_body("");
     }
 
-    #[test]
-    fn test_client_header() {
+    #[actix_rt::test]
+    async fn test_client_header() {
         let req = Client::build()
             .header(header::CONTENT_TYPE, "111")
             .finish()
@@ -639,8 +639,8 @@ mod tests {
         );
     }
 
-    #[test]
-    fn test_client_header_override() {
+    #[actix_rt::test]
+    async fn test_client_header_override() {
         let req = Client::build()
             .header(header::CONTENT_TYPE, "111")
             .finish()
@@ -658,8 +658,8 @@ mod tests {
         );
     }
 
-    #[test]
-    fn client_basic_auth() {
+    #[actix_rt::test]
+    async fn client_basic_auth() {
         let req = Client::new()
             .get("/")
             .basic_auth("username", Some("password"));
@@ -685,8 +685,8 @@ mod tests {
         );
     }
 
-    #[test]
-    fn client_bearer_auth() {
+    #[actix_rt::test]
+    async fn client_bearer_auth() {
         let req = Client::new().get("/").bearer_auth("someS3cr3tAutht0k3n");
         assert_eq!(
             req.head
@@ -699,8 +699,8 @@ mod tests {
         );
     }
 
-    #[test]
-    fn client_query() {
+    #[actix_rt::test]
+    async fn client_query() {
         let req = Client::new()
             .get("/")
             .query(&[("key1", "val1"), ("key2", "val2")])

benches/server.rs

@@ -27,15 +27,16 @@ const STR: &str = "Hello World Hello World Hello World Hello World Hello World \
 
 // benchmark sending all requests at the same time
 fn bench_async_burst(c: &mut Criterion) {
+    // We are using System here, since Runtime requires preinitialized tokio
+    // Maybe add to actix_rt docs
+    let mut rt = actix_rt::System::new("test");
+
     let srv = test::start(|| {
         App::new()
             .service(web::resource("/").route(web::to(|| HttpResponse::Ok().body(STR))))
     });
 
-    // We are using System here, since Runtime requires preinitialized tokio
-    // Maybe add to actix_rt docs
     let url = srv.url("/");
-    let mut rt = actix_rt::System::new("test");
 
     c.bench_function("get_body_async_burst", move |b| {
         b.iter_custom(|iters| {

test-server/Cargo.toml

@@ -2,7 +2,7 @@
 name = "actix-http-test"
 version = "2.0.0-alpha.1"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
-description = "Actix http test server"
+description = "Actix HTTP test server"
 readme = "README.md"
 keywords = ["http", "web", "framework", "async", "futures"]
 homepage = "https://actix.rs"
@@ -11,7 +11,7 @@ documentation = "https://docs.rs/actix-http-test/"
 categories = ["network-programming", "asynchronous",
               "web-programming::http-server",
               "web-programming::websocket"]
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 exclude = [".gitignore", ".cargo/config"]
 edition = "2018"
 
@@ -53,4 +53,4 @@ open-ssl = { version = "0.10", package = "openssl", optional = true }
 
 [dev-dependencies]
 actix-web = "3.0.0-alpha.3"
-actix-http = "2.0.0-alpha.4"
+actix-http = "2.0.0-beta.1"