add file chunks stream adapter

actix-files/CHANGES.md

@@ -1,9 +1,6 @@
 # Changes
 
 ## Unreleased - 2021-xx-xx
-- Add support for streaming audio files by setting the `content-disposition` header `inline` instead of `attachement`. [#2645]
-
-[#2645]: https://github.com/actix/actix-web/pull/2645
 
 
 ## 0.6.0 - 2022-02-25

actix-files/src/lib.rs

@@ -33,7 +33,6 @@ mod path_buf;
 mod range;
 mod service;
 
-pub use self::chunked::ChunkedReadFile;
 pub use self::directory::Directory;
 pub use self::files::Files;
 pub use self::named::NamedFile;

actix-files/src/named.rs

@@ -21,8 +21,9 @@ use actix_web::{
     Error, HttpMessage, HttpRequest, HttpResponse, Responder,
 };
 use bitflags::bitflags;
+use bytes::Bytes;
 use derive_more::{Deref, DerefMut};
-use futures_core::future::LocalBoxFuture;
+use futures_core::{future::LocalBoxFuture, Stream};
 use mime_guess::from_path;
 
 use crate::{encoding::equiv_utf8_text, range::HttpRange};
@@ -128,7 +129,7 @@ impl NamedFile {
             let ct = from_path(&path).first_or_octet_stream();
 
             let disposition = match ct.type_() {
-                mime::IMAGE | mime::TEXT | mime::AUDIO | mime::VIDEO => DispositionType::Inline,
+                mime::IMAGE | mime::TEXT | mime::VIDEO => DispositionType::Inline,
                 mime::APPLICATION => match ct.subtype() {
                     mime::JAVASCRIPT | mime::JSON => DispositionType::Inline,
                     name if name == "wasm" => DispositionType::Inline,
@@ -527,6 +528,11 @@ impl NamedFile {
 
         res.body(SizedStream::new(length, reader))
     }
+
+    /// Returns stream of chunks for the complete file.
+    pub fn into_chunk_stream(self) -> impl Stream<Item = Result<Bytes, Error>> {
+        chunked::new_chunked_read(self.md.len(), 0, self.file)
+    }
 }
 
 /// Returns true if `req` has no `If-Match` header or one which matches `etag`.

actix-http/CHANGES.md

@@ -3,18 +3,6 @@
 ## Unreleased - 2021-xx-xx
 
 
-## 3.0.2 - 2022-03-05
-### Fixed
-- Fix encoding camel-case header names with more than one hyphen. [#2683]
-
-[#2683]: https://github.com/actix/actix-web/issues/2683
-
-
-## 3.0.1 - 2022-03-04
-- Fix panic in H1 dispatcher when pipelining is used with keep-alive. [#2678]
-
-[#2678]: https://github.com/actix/actix-web/issues/2678
-
 ## 3.0.0 - 2022-02-25
 ### Dependencies
 - Updated `actix-*` to Tokio v1-based versions. [#1813]
@@ -757,10 +745,10 @@
 - Remove `ResponseError` impl for `actix::actors::resolver::ResolverError`
   due to deprecate of resolver actor. [#1813]
 - Remove `ConnectError::SslHandshakeError` and re-export of `HandshakeError`.
-  due to the removal of this type from `tokio-openssl` crate. openssl handshake
+  due to the removal of this type from `tokio-openssl` crate. openssl handshake 
   error would return as `ConnectError::SslError`. [#1813]
 - Remove `actix-threadpool` dependency. Use `actix_rt::task::spawn_blocking`.
-  Due to this change `actix_threadpool::BlockingError` type is moved into
+  Due to this change `actix_threadpool::BlockingError` type is moved into 
   `actix_http::error` module. [#1878]
 
 [#1813]: https://github.com/actix/actix-web/pull/1813

actix-http/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "actix-http"
-version = "3.0.2"
+version = "3.0.0"
 authors = [
     "Nikolay Kim <fafhrd91@gmail.com>",
     "Rob Ede <robjtede@icloud.com>",

actix-http/README.md

@@ -3,11 +3,11 @@
 > HTTP primitives for the Actix ecosystem.
 
 [![crates.io](https://img.shields.io/crates/v/actix-http?label=latest)](https://crates.io/crates/actix-http)
-[![Documentation](https://docs.rs/actix-http/badge.svg?version=3.0.2)](https://docs.rs/actix-http/3.0.2)
+[![Documentation](https://docs.rs/actix-http/badge.svg?version=3.0.0)](https://docs.rs/actix-http/3.0.0)
 [![Version](https://img.shields.io/badge/rustc-1.54+-ab6000.svg)](https://blog.rust-lang.org/2021/05/06/Rust-1.54.0.html)
 ![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/actix-http.svg)
 <br />
-[![dependency status](https://deps.rs/crate/actix-http/3.0.2/status.svg)](https://deps.rs/crate/actix-http/3.0.2)
+[![dependency status](https://deps.rs/crate/actix-http/3.0.0/status.svg)](https://deps.rs/crate/actix-http/3.0.0)
 [![Download](https://img.shields.io/crates/d/actix-http.svg)](https://crates.io/crates/actix-http)
 [![Chat on Discord](https://img.shields.io/discord/771444961383153695?label=chat&logo=discord)](https://discord.gg/NWpN5mmg3x)
 

actix-http/src/h1/dispatcher.rs

@@ -375,6 +375,8 @@ where
                 DispatchError::Io(err)
             })?;
 
+        this.flags.set(Flags::KEEP_ALIVE, this.codec.keep_alive());
+
         Ok(size)
     }
 
@@ -457,12 +459,7 @@ where
                     }
 
                     // all messages are dealt with
-                    None => {
-                        // start keep-alive if last request allowed it
-                        this.flags.set(Flags::KEEP_ALIVE, this.codec.keep_alive());
-
-                        return Ok(PollResponse::DoNothing);
-                    }
+                    None => return Ok(PollResponse::DoNothing),
                 },
 
                 StateProj::ServiceCall { fut } => {
@@ -760,7 +757,6 @@ where
 
         let mut updated = false;
 
-        // decode from read buf as many full requests as possible
         loop {
             match this.codec.decode(this.read_buf) {
                 Ok(Some(msg)) => {

actix-http/src/h1/encoder.rs

@@ -517,7 +517,6 @@ unsafe fn write_camel_case(value: &[u8], buf: *mut u8, len: usize) {
             if let Some(c @ b'a'..=b'z') = iter.next() {
                 buffer[index] = c & 0b1101_1111;
             }
-            index += 1;
         }
 
         index += 1;
@@ -529,7 +528,7 @@ mod tests {
     use std::rc::Rc;
 
     use bytes::Bytes;
-    use http::header::{AUTHORIZATION, UPGRADE_INSECURE_REQUESTS};
+    use http::header::AUTHORIZATION;
 
     use super::*;
     use crate::{
@@ -560,9 +559,6 @@ mod tests {
         head.headers
             .insert(CONTENT_TYPE, HeaderValue::from_static("plain/text"));
 
-        head.headers
-            .insert(UPGRADE_INSECURE_REQUESTS, HeaderValue::from_static("1"));
-
         let mut head = RequestHeadType::Owned(head);
 
         let _ = head.encode_headers(
@@ -578,7 +574,6 @@ mod tests {
         assert!(data.contains("Connection: close\r\n"));
         assert!(data.contains("Content-Type: plain/text\r\n"));
         assert!(data.contains("Date: date\r\n"));
-        assert!(data.contains("Upgrade-Insecure-Requests: 1\r\n"));
 
         let _ = head.encode_headers(
             &mut bytes,

actix-web-actors/CHANGES.md

@@ -3,12 +3,6 @@
 ## Unreleased - 2021-xx-xx
 
 
-## 4.1.0 - 2022-03-02
-- Add support for `actix` version `0.13`. [#2675]
-
-[#2675]: https://github.com/actix/actix-web/pull/2675
-
-
 ## 4.0.0 - 2022-02-25
 - No significant changes since `4.0.0-beta.12`.
 

actix-web-actors/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "actix-web-actors"
-version = "4.1.0"
+version = "4.0.0"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Actix actors support for Actix Web"
 keywords = ["actix", "http", "web", "framework", "async"]
@@ -14,16 +14,16 @@ name = "actix_web_actors"
 path = "src/lib.rs"
 
 [dependencies]
-actix = { version = ">=0.12, <0.14", default-features = false }
+actix = { version = "0.12.0", default-features = false }
 actix-codec = "0.5"
-actix-http = "3"
-actix-web = { version = "4", default-features = false }
+actix-http = "3.0.0"
+actix-web = { version = "4.0.0", default-features = false }
 
 bytes = "1"
 bytestring = "1"
 futures-core = { version = "0.3.7", default-features = false }
 pin-project-lite = "0.2"
-tokio = { version = "1.13.1", features = ["sync"] }
+tokio = { version = "1.8.4", features = ["sync"] }
 
 [dev-dependencies]
 actix-rt = "2.2"

actix-web-actors/README.md

@@ -3,11 +3,11 @@
 > Actix actors support for Actix Web.
 
 [![crates.io](https://img.shields.io/crates/v/actix-web-actors?label=latest)](https://crates.io/crates/actix-web-actors)
-[![Documentation](https://docs.rs/actix-web-actors/badge.svg?version=4.1.0)](https://docs.rs/actix-web-actors/4.1.0)
+[![Documentation](https://docs.rs/actix-web-actors/badge.svg?version=4.0.0)](https://docs.rs/actix-web-actors/4.0.0)
 [![Version](https://img.shields.io/badge/rustc-1.54+-ab6000.svg)](https://blog.rust-lang.org/2021/05/06/Rust-1.54.0.html)
 ![License](https://img.shields.io/crates/l/actix-web-actors.svg)
 <br />
-[![dependency status](https://deps.rs/crate/actix-web-actors/4.1.0/status.svg)](https://deps.rs/crate/actix-web-actors/4.1.0)
+[![dependency status](https://deps.rs/crate/actix-web-actors/4.0.0/status.svg)](https://deps.rs/crate/actix-web-actors/4.0.0)
 [![Download](https://img.shields.io/crates/d/actix-web-actors.svg)](https://crates.io/crates/actix-web-actors)
 [![Chat on Discord](https://img.shields.io/discord/771444961383153695?label=chat&logo=discord)](https://discord.gg/NWpN5mmg3x)