-
Actix web
+
Actix Web
Actix Web is a powerful, pragmatic, and extremely fast web framework for Rust
[](https://crates.io/crates/actix-web)
-[](https://docs.rs/actix-web/3.3.2)
-[](https://blog.rust-lang.org/2020/03/12/Rust-1.46.html)
-
-[](https://deps.rs/crate/actix-web/3.3.2)
+[](https://docs.rs/actix-web/4.0.0-beta.13)
+[](https://blog.rust-lang.org/2021/05/06/Rust-1.52.0.html)
+
+[](https://deps.rs/crate/actix-web/4.0.0-beta.13)
-[](https://travis-ci.org/actix/actix-web)
+[](https://github.com/actix/actix-web/actions)
[](https://codecov.io/gh/actix/actix-web)
-[](https://crates.io/crates/actix-web)
-[](https://gitter.im/actix/actix?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
[](https://discord.gg/NWpN5mmg3x)
@@ -26,15 +25,14 @@
* Streaming and pipelining
* Keep-alive and slow requests handling
* Client/server [WebSockets](https://actix.rs/docs/websockets/) support
-* Transparent content compression/decompression (br, gzip, deflate)
+* Transparent content compression/decompression (br, gzip, deflate, zstd)
* Powerful [request routing](https://actix.rs/docs/url-dispatch/)
* Multipart streams
* Static assets
* SSL support using OpenSSL or Rustls
* Middlewares ([Logger, Session, CORS, etc](https://actix.rs/docs/middleware/))
-* Includes an async [HTTP client](https://actix.rs/actix-web/actix_web/client/index.html)
-* Supports [Actix actor framework](https://github.com/actix/actix)
-* Runs on stable Rust 1.46+
+* Includes an async [HTTP client](https://docs.rs/awc/)
+* Runs on stable Rust 1.52+
## Documentation
@@ -73,18 +71,18 @@ async fn main() -> std::io::Result<()> {
### More examples
-* [Basic Setup](https://github.com/actix/examples/tree/master/basics/)
-* [Application State](https://github.com/actix/examples/tree/master/state/)
-* [JSON Handling](https://github.com/actix/examples/tree/master/json/)
-* [Multipart Streams](https://github.com/actix/examples/tree/master/multipart/)
-* [Diesel Integration](https://github.com/actix/examples/tree/master/diesel/)
-* [r2d2 Integration](https://github.com/actix/examples/tree/master/r2d2/)
-* [Simple WebSocket](https://github.com/actix/examples/tree/master/websocket/)
-* [Tera Templates](https://github.com/actix/examples/tree/master/template_tera/)
-* [Askama Templates](https://github.com/actix/examples/tree/master/template_askama/)
-* [HTTPS using Rustls](https://github.com/actix/examples/tree/master/rustls/)
-* [HTTPS using OpenSSL](https://github.com/actix/examples/tree/master/openssl/)
-* [WebSocket Chat](https://github.com/actix/examples/tree/master/websocket-chat/)
+* [Basic Setup](https://github.com/actix/examples/tree/master/basics/basics/)
+* [Application State](https://github.com/actix/examples/tree/master/basics/state/)
+* [JSON Handling](https://github.com/actix/examples/tree/master/json/json/)
+* [Multipart Streams](https://github.com/actix/examples/tree/master/forms/multipart/)
+* [Diesel Integration](https://github.com/actix/examples/tree/master/database_interactions/diesel/)
+* [r2d2 Integration](https://github.com/actix/examples/tree/master/database_interactions/r2d2/)
+* [Simple WebSocket](https://github.com/actix/examples/tree/master/websockets/websocket/)
+* [Tera Templates](https://github.com/actix/examples/tree/master/template_engines/tera/)
+* [Askama Templates](https://github.com/actix/examples/tree/master/template_engines/askama/)
+* [HTTPS using Rustls](https://github.com/actix/examples/tree/master/security/rustls/)
+* [HTTPS using OpenSSL](https://github.com/actix/examples/tree/master/security/openssl/)
+* [WebSocket Chat](https://github.com/actix/examples/tree/master/websockets/chat/)
You may consider checking out
[this directory](https://github.com/actix/examples/tree/master/) for more examples.
@@ -92,16 +90,16 @@ You may consider checking out
## Benchmarks
One of the fastest web frameworks available according to the
-[TechEmpower Framework Benchmark](https://www.techempower.com/benchmarks/#section=data-r19).
+[TechEmpower Framework Benchmark](https://www.techempower.com/benchmarks/#section=data-r20&test=composite).
## License
This project is licensed under either of
* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
- [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0))
+ [http://www.apache.org/licenses/LICENSE-2.0])
* MIT license ([LICENSE-MIT](LICENSE-MIT) or
- [http://opensource.org/licenses/MIT](http://opensource.org/licenses/MIT))
+ [http://opensource.org/licenses/MIT])
at your option.
diff --git a/actix-files/CHANGES.md b/actix-files/CHANGES.md
index 9f606dfcd..63d8efc3f 100644
--- a/actix-files/CHANGES.md
+++ b/actix-files/CHANGES.md
@@ -1,9 +1,65 @@
# Changes
## Unreleased - 2021-xx-xx
+
+
+## 0.6.0-beta.9 - 2021-11-22
+* Add crate feature `experimental-io-uring`, enabling async file I/O to be utilized. This feature is only available on Linux OSes with recent kernel versions. This feature is semver-exempt. [#2408]
+* Add `NamedFile::open_async`. [#2408]
+* Fix 304 Not Modified responses to omit the Content-Length header, as per the spec. [#2453]
+* The `Responder` impl for `NamedFile` now has a boxed future associated type. [#2408]
+* The `Service` impl for `NamedFileService` now has a boxed future associated type. [#2408]
+* Add `impl Clone` for `FilesService`. [#2408]
+
+[#2408]: https://github.com/actix/actix-web/pull/2408
+[#2453]: https://github.com/actix/actix-web/pull/2453
+
+
+## 0.6.0-beta.8 - 2021-10-20
+* Minimum supported Rust version (MSRV) is now 1.52.
+
+
+## 0.6.0-beta.7 - 2021-09-09
+* Minimum supported Rust version (MSRV) is now 1.51.
+
+
+## 0.6.0-beta.6 - 2021-06-26
+* Added `Files::path_filter()`. [#2274]
+* `Files::show_files_listing()` can now be used with `Files::index_file()` to show files listing as a fallback when the index file is not found. [#2228]
+
+[#2274]: https://github.com/actix/actix-web/pull/2274
+[#2228]: https://github.com/actix/actix-web/pull/2228
+
+
+## 0.6.0-beta.5 - 2021-06-17
+* `NamedFile` now implements `ServiceFactory` and `HttpServiceFactory` making it much more useful in routing. For example, it can be used directly as a default service. [#2135]
+* For symbolic links, `Content-Disposition` header no longer shows the filename of the original file. [#2156]
+* `Files::redirect_to_slash_directory()` now works as expected when used with `Files::show_files_listing()`. [#2225]
+* `application/{javascript, json, wasm}` mime type now have `inline` disposition by default. [#2257]
+
+[#2135]: https://github.com/actix/actix-web/pull/2135
+[#2156]: https://github.com/actix/actix-web/pull/2156
+[#2225]: https://github.com/actix/actix-web/pull/2225
+[#2257]: https://github.com/actix/actix-web/pull/2257
+
+
+## 0.6.0-beta.4 - 2021-04-02
+* Add support for `.guard` in `Files` to selectively filter `Files` services. [#2046]
+
+[#2046]: https://github.com/actix/actix-web/pull/2046
+
+
+## 0.6.0-beta.3 - 2021-03-09
+* No notable changes.
+
+
+## 0.6.0-beta.2 - 2021-02-10
* Fix If-Modified-Since and If-Unmodified-Since to not compare using sub-second timestamps. [#1887]
+* Replace `v_htmlescape` with `askama_escape`. [#1953]
[#1887]: https://github.com/actix/actix-web/pull/1887
+[#1953]: https://github.com/actix/actix-web/pull/1953
+
## 0.6.0-beta.1 - 2021-01-07
* `HttpRange::parse` now has its own error type.
diff --git a/actix-files/Cargo.toml b/actix-files/Cargo.toml
index bde2cb717..6b6d6d245 100644
--- a/actix-files/Cargo.toml
+++ b/actix-files/Cargo.toml
@@ -1,13 +1,15 @@
[package]
name = "actix-files"
-version = "0.6.0-beta.1"
-authors = ["Nikolay Kim
"]
+version = "0.6.0-beta.9"
+authors = [
+ "Nikolay Kim ",
+ "fakeshadow <24548779@qq.com>",
+ "Rob Ede ",
+]
description = "Static file serving for Actix Web"
-readme = "README.md"
keywords = ["actix", "http", "async", "futures"]
homepage = "https://actix.rs"
-repository = "https://github.com/actix/actix-web.git"
-documentation = "https://docs.rs/actix-files/"
+repository = "https://github.com/actix/actix-web"
categories = ["asynchronous", "web-programming::http-server"]
license = "MIT OR Apache-2.0"
edition = "2018"
@@ -16,20 +18,30 @@ edition = "2018"
name = "actix_files"
path = "src/lib.rs"
+[features]
+experimental-io-uring = ["actix-web/experimental-io-uring", "tokio-uring"]
+
[dependencies]
-actix-web = { version = "4.0.0-beta.1", default-features = false }
-actix-service = "2.0.0-beta.3"
+actix-web = { version = "4.0.0-beta.11", default-features = false }
+actix-http = "3.0.0-beta.14"
+actix-service = "2"
+actix-utils = "3"
+
+askama_escape = "0.10"
bitflags = "1"
bytes = "1"
-futures-core = { version = "0.3.7", default-features = false }
-futures-util = { version = "0.3.7", default-features = false }
+futures-core = { version = "0.3.7", default-features = false, features = ["alloc"] }
+http-range = "0.1.4"
derive_more = "0.99.5"
log = "0.4"
mime = "0.3"
mime_guess = "2.0.1"
percent-encoding = "2.1"
-v_htmlescape = "0.12"
+pin-project-lite = "0.2.7"
+
+tokio-uring = { version = "0.1", optional = true }
[dev-dependencies]
-actix-rt = "2.0.0-beta.2"
-actix-web = "4.0.0-beta.1"
+actix-rt = "2.2"
+actix-web = "4.0.0-beta.11"
+actix-test = "0.1.0-beta.7"
diff --git a/actix-files/README.md b/actix-files/README.md
index 463f20224..84e556fa9 100644
--- a/actix-files/README.md
+++ b/actix-files/README.md
@@ -3,17 +3,16 @@
> Static file serving for Actix Web
[](https://crates.io/crates/actix-files)
-[](https://docs.rs/actix-files/0.5.0)
-[](https://blog.rust-lang.org/2020/03/12/Rust-1.46.html)
+[](https://docs.rs/actix-files/0.6.0-beta.9)
+[](https://blog.rust-lang.org/2021/05/06/Rust-1.52.0.html)
-[](https://deps.rs/crate/actix-files/0.5.0)
+[](https://deps.rs/crate/actix-files/0.6.0-beta.9)
[](https://crates.io/crates/actix-files)
-[](https://gitter.im/actix/actix?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[](https://discord.gg/NWpN5mmg3x)
## Documentation & Resources
- [API Documentation](https://docs.rs/actix-files/)
-- [Example Project](https://github.com/actix/examples/tree/master/static_index)
-- [Chat on Gitter](https://gitter.im/actix/actix-web)
-- Minimum supported Rust version: 1.46 or later
+- [Example Project](https://github.com/actix/examples/tree/master/basics/static_index)
+- Minimum Supported Rust Version (MSRV): 1.52
diff --git a/actix-files/src/chunked.rs b/actix-files/src/chunked.rs
index 5b7b17dc4..68221ccc3 100644
--- a/actix-files/src/chunked.rs
+++ b/actix-files/src/chunked.rs
@@ -1,86 +1,277 @@
use std::{
cmp, fmt,
- fs::File,
future::Future,
- io::{self, Read, Seek},
+ io,
pin::Pin,
task::{Context, Poll},
};
-use actix_web::{
- error::{Error, ErrorInternalServerError},
- rt::task::{spawn_blocking, JoinHandle},
-};
-use bytes::Bytes;
+use actix_web::{error::Error, web::Bytes};
use futures_core::{ready, Stream};
+use pin_project_lite::pin_project;
-#[doc(hidden)]
-/// A helper created from a `std::fs::File` which reads the file
-/// chunk-by-chunk on a `ThreadPool`.
-pub struct ChunkedReadFile {
- pub(crate) size: u64,
- pub(crate) offset: u64,
- pub(crate) file: Option,
- pub(crate) fut: Option>>,
- pub(crate) counter: u64,
+use super::named::File;
+
+pin_project! {
+ /// Adapter to read a `std::file::File` in chunks.
+ #[doc(hidden)]
+ pub struct ChunkedReadFile {
+ size: u64,
+ offset: u64,
+ #[pin]
+ state: ChunkedReadFileState,
+ counter: u64,
+ callback: F,
+ }
}
-impl fmt::Debug for ChunkedReadFile {
+#[cfg(not(feature = "experimental-io-uring"))]
+pin_project! {
+ #[project = ChunkedReadFileStateProj]
+ #[project_replace = ChunkedReadFileStateProjReplace]
+ enum ChunkedReadFileState {
+ File { file: Option, },
+ Future { #[pin] fut: Fut },
+ }
+}
+
+#[cfg(feature = "experimental-io-uring")]
+pin_project! {
+ #[project = ChunkedReadFileStateProj]
+ #[project_replace = ChunkedReadFileStateProjReplace]
+ enum ChunkedReadFileState {
+ File { file: Option<(File, BytesMut)> },
+ Future { #[pin] fut: Fut },
+ }
+}
+
+impl fmt::Debug for ChunkedReadFile {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
f.write_str("ChunkedReadFile")
}
}
-impl Stream for ChunkedReadFile {
+pub(crate) fn new_chunked_read(
+ size: u64,
+ offset: u64,
+ file: File,
+) -> impl Stream- > {
+ ChunkedReadFile {
+ size,
+ offset,
+ #[cfg(not(feature = "experimental-io-uring"))]
+ state: ChunkedReadFileState::File { file: Some(file) },
+ #[cfg(feature = "experimental-io-uring")]
+ state: ChunkedReadFileState::File {
+ file: Some((file, BytesMut::new())),
+ },
+ counter: 0,
+ callback: chunked_read_file_callback,
+ }
+}
+
+#[cfg(not(feature = "experimental-io-uring"))]
+async fn chunked_read_file_callback(
+ mut file: File,
+ offset: u64,
+ max_bytes: usize,
+) -> Result<(File, Bytes), Error> {
+ use io::{Read as _, Seek as _};
+
+ let res = actix_web::rt::task::spawn_blocking(move || {
+ let mut buf = Vec::with_capacity(max_bytes);
+
+ file.seek(io::SeekFrom::Start(offset))?;
+
+ let n_bytes = file.by_ref().take(max_bytes as u64).read_to_end(&mut buf)?;
+
+ if n_bytes == 0 {
+ Err(io::Error::from(io::ErrorKind::UnexpectedEof))
+ } else {
+ Ok((file, Bytes::from(buf)))
+ }
+ })
+ .await
+ .map_err(|_| actix_web::error::BlockingError)??;
+
+ Ok(res)
+}
+
+#[cfg(feature = "experimental-io-uring")]
+async fn chunked_read_file_callback(
+ file: File,
+ offset: u64,
+ max_bytes: usize,
+ mut bytes_mut: BytesMut,
+) -> io::Result<(File, Bytes, BytesMut)> {
+ bytes_mut.reserve(max_bytes);
+
+ let (res, mut bytes_mut) = file.read_at(bytes_mut, offset).await;
+ let n_bytes = res?;
+
+ if n_bytes == 0 {
+ return Err(io::ErrorKind::UnexpectedEof.into());
+ }
+
+ let bytes = bytes_mut.split_to(n_bytes).freeze();
+
+ Ok((file, bytes, bytes_mut))
+}
+
+#[cfg(feature = "experimental-io-uring")]
+impl Stream for ChunkedReadFile
+where
+ F: Fn(File, u64, usize, BytesMut) -> Fut,
+ Fut: Future