berkus
/
actix-web
mirror of https://github.com/fafhrd91/actix-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge 56465819d2 into 8996198f2c

This commit is contained in:
George Pollard 2025-08-27 01:06:57 +01:00 committed by GitHub
parent 8996198f2c 56465819d2
commit 1b166289d6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actix-web-actors/Cargo.toml
View File

@ -24,7 +24,7 @@ allowed_external_types = [
actix = { version = ">=0.12, <0.14", default-features = false } actix = { version = ">=0.12, <0.14", default-features = false }
actix-codec = "0.5" actix-codec = "0.5"
actix-http = "3" actix-http = "3"
actix-web = { version = "4", default-features = false } actix-web = { version = "4", default-features = false, features = ["ws"] }
bytes = "1" bytes = "1"
bytestring = "1" bytestring = "1"

1
actix-web/CHANGES.md
View File

@ -15,6 +15,7 @@
- Ignore `Host` header in `Host` guard when connection protocol is HTTP/2. - Ignore `Host` header in `Host` guard when connection protocol is HTTP/2.
- Re-export `mime` dependency. - Re-export `mime` dependency.
- Update `brotli` dependency to `8`. - Update `brotli` dependency to `8`.
- Make `ws` feature of `actix-http` optional (controlled by `ws` feature in `actix-web`).
## 4.10.2 ## 4.10.2

6
actix-web/Cargo.toml
View File

@ -67,6 +67,7 @@ default = [
"http2", "http2",
"unicode", "unicode",
"compat", "compat",
"ws",
] ]
# Brotli algorithm content-encoding support # Brotli algorithm content-encoding support
@ -88,6 +89,9 @@ secure-cookies = ["cookies", "cookie/secure"]
# HTTP/2 support (including h2c). # HTTP/2 support (including h2c).
http2 = ["actix-http/http2"] http2 = ["actix-http/http2"]
# Websockets support
ws = ["actix-http/ws"]
# TLS via OpenSSL # TLS via OpenSSL
openssl = ["__tls", "http2", "actix-http/openssl", "actix-tls/accept", "actix-tls/openssl"] openssl = ["__tls", "http2", "actix-http/openssl", "actix-tls/accept", "actix-tls/openssl"]
@ -131,7 +135,7 @@ actix-service = "2"
actix-tls = { version = "3.4", default-features = false, optional = true } actix-tls = { version = "3.4", default-features = false, optional = true }
actix-utils = "3" actix-utils = "3"
actix-http = { version = "3.11", features = ["ws"] } actix-http = { version = "3.11" }
actix-router = { version = "0.5.3", default-features = false, features = ["http"] } actix-router = { version = "0.5.3", default-features = false, features = ["http"] }
actix-web-codegen = { version = "4.3", optional = true, default-features = false } actix-web-codegen = { version = "4.3", optional = true, default-features = false }

3
actix-web/src/error/response_error.rs
View File

@ -7,6 +7,7 @@ use std::{
io::{self, Write as _}, io::{self, Write as _},
}; };
#[cfg(feature = "ws")]
use actix_http::Response; use actix_http::Response;
use bytes::BytesMut; use bytes::BytesMut;
@ -126,6 +127,7 @@ impl ResponseError for actix_http::error::PayloadError {
} }
} }
#[cfg(feature = "ws")]
impl ResponseError for actix_http::ws::ProtocolError {} impl ResponseError for actix_http::ws::ProtocolError {}
impl ResponseError for actix_http::error::ContentTypeError { impl ResponseError for actix_http::error::ContentTypeError {
@ -134,6 +136,7 @@ impl ResponseError for actix_http::error::ContentTypeError {
} }
} }
#[cfg(feature = "ws")]
impl ResponseError for actix_http::ws::HandshakeError { impl ResponseError for actix_http::ws::HandshakeError {
fn error_response(&self) -> HttpResponse<BoxBody> { fn error_response(&self) -> HttpResponse<BoxBody> {
Response::from(self).map_into_boxed_body().into() Response::from(self).map_into_boxed_body().into()