Merge branch 'master' into scope_work

.github/workflows/bench.yml

@@ -5,7 +5,7 @@ on:
     branches: [master]
 
 permissions:
-  contents: read # to fetch code (actions/checkout)
+  contents: read
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

.github/workflows/ci-post-merge.yml

@@ -45,7 +45,7 @@ jobs:
           toolchain: ${{ matrix.version.version }}
 
       - name: Install cargo-hack
-        uses: taiki-e/install-action@v2.20.14
+        uses: taiki-e/install-action@v2.21.3
         with:
           tool: cargo-hack
 
@@ -85,7 +85,7 @@ jobs:
         uses: actions-rust-lang/setup-rust-toolchain@v1.5.0
 
       - name: Install cargo-hack
-        uses: taiki-e/install-action@v2.20.14
+        uses: taiki-e/install-action@v2.21.3
         with:
           tool: cargo-hack
 
@@ -106,7 +106,7 @@ jobs:
         uses: actions-rust-lang/setup-rust-toolchain@v1.5.0
 
       - name: Install nextest
-        uses: taiki-e/install-action@v2.20.14
+        uses: taiki-e/install-action@v2.21.3
         with:
           tool: nextest
 

.github/workflows/ci.yml

@@ -50,7 +50,7 @@ jobs:
           toolchain: ${{ matrix.version.version }}
 
       - name: Install cargo-hack
-        uses: taiki-e/install-action@v2.20.14
+        uses: taiki-e/install-action@v2.21.3
         with:
           tool: cargo-hack
 

.github/workflows/clippy-fmt.yml

@@ -70,7 +70,7 @@ jobs:
         with:
           toolchain: nightly-2023-08-25
 
-      - uses: taiki-e/cache-cargo-install-action@v1.2.2
+      - uses: taiki-e/cache-cargo-install-action@v1.3.0
         with:
           tool: cargo-public-api
 

.github/workflows/coverage.yml

@@ -23,7 +23,7 @@ jobs:
           components: llvm-tools-preview
 
       - name: Install cargo-llvm-cov
-        uses: taiki-e/install-action@v2.20.14
+        uses: taiki-e/install-action@v2.21.3
         with:
           tool: cargo-llvm-cov
 

.github/workflows/upload-doc.yml

@@ -6,6 +6,7 @@ on:
 
 permissions:
   contents: read
+
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true

actix-files/Cargo.toml

@@ -47,4 +47,5 @@ actix-server = { version = "2.2", optional = true } # ensure matching tokio-urin
 actix-rt = "2.7"
 actix-test = "0.1"
 actix-web = "4"
+env_logger = "0.10"
 tempfile = "3.2"

actix-files/examples/guarded-listing.rs

@@ -0,0 +1,33 @@
+use actix_files::Files;
+use actix_web::{get, guard, middleware, App, HttpServer, Responder};
+
+const EXAMPLES_DIR: &str = concat![env!("CARGO_MANIFEST_DIR"), "/examples"];
+
+#[get("/")]
+async fn index() -> impl Responder {
+    "Hello world!"
+}
+
+#[actix_web::main]
+async fn main() -> std::io::Result<()> {
+    env_logger::init_from_env(env_logger::Env::new().default_filter_or("info"));
+
+    log::info!("starting HTTP server at http://localhost:8080");
+
+    HttpServer::new(|| {
+        App::new()
+            .service(index)
+            .service(
+                Files::new("/assets", EXAMPLES_DIR)
+                    .show_files_listing()
+                    .guard(guard::Header("show-listing", "?1")),
+            )
+            .service(Files::new("/assets", EXAMPLES_DIR))
+            .wrap(middleware::Compress::default())
+            .wrap(middleware::Logger::default())
+    })
+    .bind(("127.0.0.1", 8080))?
+    .workers(2)
+    .run()
+    .await
+}

actix-files/src/files.rs

@@ -235,7 +235,7 @@ impl Files {
     /// request starts being handled by the file service, it will not be able to back-out and try
     /// the next service, you will simply get a 404 (or 405) error response.
     ///
-    /// To allow `POST` requests to retrieve files, see [`Files::use_guards`].
+    /// To allow `POST` requests to retrieve files, see [`Files::method_guard()`].
     ///
     /// # Examples
     /// ```

actix-http/CHANGES.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### Changed
+
+- Updated `zstd` dependency to `0.13`.
+
 ## 3.4.0
 
 ### Added

actix-http/Cargo.toml

@@ -103,7 +103,7 @@ actix-tls = { version = "3.1", default-features = false, optional = true }
 # compress-*
 brotli = { version = "3.3.3", optional = true }
 flate2 = { version = "1.0.13", optional = true }
-zstd = { version = "0.12", optional = true }
+zstd = { version = "0.13", optional = true }
 
 [dev-dependencies]
 actix-http-test = { version = "3", features = ["openssl"] }

actix-web/CHANGES.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### Changed
+
+- Updated `zstd` dependency to `0.13`.
+
 ## 4.4.0
 
 ### Added

actix-web/Cargo.toml

@@ -122,7 +122,7 @@ static_assertions = "1"
 tls-openssl = { package = "openssl", version = "0.10.55" }
 tls-rustls = { package = "rustls", version = "0.21" }
 tokio = { version = "1.24.2", features = ["rt-multi-thread", "macros"] }
-zstd = "0.12"
+zstd = "0.13"
 
 [[test]]
 name = "test_server"

actix-web/src/response/mod.rs

@@ -5,8 +5,6 @@ mod responder;
 #[allow(clippy::module_inception)]
 mod response;
 
-#[cfg(feature = "cookies")]
-pub use self::response::CookieIter;
 pub use self::{
     builder::HttpResponseBuilder, customize_responder::CustomizeResponder, responder::Responder,
     response::HttpResponse,

actix-web/src/server.rs

@@ -99,6 +99,12 @@ where
     B: MessageBody + 'static,
 {
     /// Create new HTTP server with application factory
+    ///
+    /// # Worker Count
+    ///
+    /// The `factory` will be instantiated multiple times in most configurations. See
+    /// [`bind()`](Self::bind()) docs for more on how worker count and bind address resolution
+    /// causes multiple server factory instantiations.
     pub fn new(factory: F) -> Self {
         HttpServer {
             factory,
@@ -119,7 +125,18 @@ where
 
     /// Sets number of workers to start (per bind address).
     ///
-    /// By default, the number of available physical CPUs is used as the worker count.
+    /// The default worker count is the determined by [`std::thread::available_parallelism()`]. See
+    /// its documentation to determine what behavior you should expect when server is run.
+    ///
+    /// Note that the server factory passed to [`new`](Self::new()) will be instantiated **at least
+    /// once per worker**. See [`bind()`](Self::bind()) docs for more on how worker count and bind
+    /// address resolution causes multiple server factory instantiations.
+    ///
+    /// `num` must be greater than 0.
+    ///
+    /// # Panics
+    ///
+    /// Panics if `num` is 0.
     pub fn workers(mut self, num: usize) -> Self {
         self.builder = self.builder.workers(num);
         self
@@ -319,23 +336,41 @@ where
     /// Resolves socket address(es) and binds server to created listener(s).
     ///
     /// # Hostname Resolution
-    /// When `addr` includes a hostname, it is possible for this method to bind to both the IPv4 and
-    /// IPv6 addresses that result from a DNS lookup. You can test this by passing `localhost:8080`
-    /// and noting that the server binds to `127.0.0.1:8080` _and_ `[::1]:8080`. To bind additional
-    /// addresses, call this method multiple times.
+    ///
+    /// When `addrs` includes a hostname, it is possible for this method to bind to both the IPv4
+    /// and IPv6 addresses that result from a DNS lookup. You can test this by passing
+    /// `localhost:8080` and noting that the server binds to `127.0.0.1:8080` _and_ `[::1]:8080`. To
+    /// bind additional addresses, call this method multiple times.
     ///
     /// Note that, if a DNS lookup is required, resolving hostnames is a blocking operation.
     ///
+    /// # Worker Count
+    ///
+    /// The `factory` will be instantiated multiple times in most scenarios. The number of
+    /// instantiations is number of [`workers`](Self::workers()) × number of sockets resolved by
+    /// `addrs`.
+    ///
+    /// For example, if you've manually set [`workers`](Self::workers()) to 2, and use `127.0.0.1`
+    /// as the bind `addrs`, then `factory` will be instantiated twice. However, using `localhost`
+    /// as the bind `addrs` can often resolve to both `127.0.0.1` (IPv4) _and_ `::1` (IPv6), causing
+    /// the `factory` to be instantiated 4 times (2 workers × 2 bind addresses).
+    ///
+    /// Using a bind address of `0.0.0.0`, which signals to use all interfaces, may also multiple
+    /// the number of instantiations in a similar way.
+    ///
     /// # Typical Usage
+    ///
     /// In general, use `127.0.0.1:<port>` when testing locally and `0.0.0.0:<port>` when deploying
     /// (with or without a reverse proxy or load balancer) so that the server is accessible.
     ///
     /// # Errors
+    ///
     /// Returns an `io::Error` if:
     /// - `addrs` cannot be resolved into one or more socket addresses;
     /// - all the resolved socket addresses are already bound.
     ///
     /// # Example
+    ///
     /// ```
     /// # use actix_web::{App, HttpServer};
     /// # fn inner() -> std::io::Result<()> {
@@ -356,6 +391,8 @@ where
 
     /// Resolves socket address(es) and binds server to created listener(s) for plaintext HTTP/1.x
     /// or HTTP/2 connections.
+    ///
+    /// See [`bind()`](Self::bind()) for more details on `addrs` argument.
     #[cfg(feature = "http2")]
     pub fn bind_auto_h2c<A: net::ToSocketAddrs>(mut self, addrs: A) -> io::Result<Self> {
         let sockets = bind_addrs(addrs, self.backlog)?;
@@ -370,7 +407,7 @@ where
     /// Resolves socket address(es) and binds server to created listener(s) for TLS connections
     /// using Rustls v0.20.
     ///
-    /// See [`bind()`](Self::bind) for more details on `addrs` argument.
+    /// See [`bind()`](Self::bind()) for more details on `addrs` argument.
     ///
     /// ALPN protocols "h2" and "http/1.1" are added to any configured ones.
     #[cfg(feature = "rustls-0_20")]
@@ -389,7 +426,7 @@ where
     /// Resolves socket address(es) and binds server to created listener(s) for TLS connections
     /// using Rustls v0.21.
     ///
-    /// See [`bind()`](Self::bind) for more details on `addrs` argument.
+    /// See [`bind()`](Self::bind()) for more details on `addrs` argument.
     ///
     /// ALPN protocols "h2" and "http/1.1" are added to any configured ones.
     #[cfg(feature = "rustls-0_21")]
@@ -408,7 +445,7 @@ where
     /// Resolves socket address(es) and binds server to created listener(s) for TLS connections
     /// using OpenSSL.
     ///
-    /// See [`bind()`](Self::bind) for more details on `addrs` argument.
+    /// See [`bind()`](Self::bind()) for more details on `addrs` argument.
     ///
     /// ALPN protocols "h2" and "http/1.1" are added to any configured ones.
     #[cfg(feature = "openssl")]

awc/CHANGES.md

@@ -3,6 +3,7 @@
 ## Unreleased
 
 - Update `trust-dns-resolver` dependency to `0.23`.
+- Updated `zstd` dependency to `0.13`.
 
 ## 3.2.0
 

awc/Cargo.toml

@@ -111,7 +111,7 @@ static_assertions = "1.1"
 rcgen = "0.11"
 rustls-pemfile = "1"
 tokio = { version = "1.24.2", features = ["rt-multi-thread", "macros"] }
-zstd = "0.12"
+zstd = "0.13"
 
 [[example]]
 name = "client"