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

update changelog

This commit is contained in:
Rob Ede 2022-01-03 18:02:49 +00:00
parent 9dabaafb12
commit 1dc5997635
No known key found for this signature in database
GPG Key ID: 97C636207D3EF933
3 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.md
View File

@ -15,8 +15,10 @@
### Removed ### Removed
- `Compress::new`; restricting compression algorithm is done through feature flags. [#2501] - `Compress::new`; restricting compression algorithm is done through feature flags. [#2501]
- `BodyEncoding` trait; signalling content encoding is now only done via the `Content-Encoding` header. [#2565]
[#2501]: https://github.com/actix/actix-web/pull/2501 [#2501]: https://github.com/actix/actix-web/pull/2501
[#2565]: https://github.com/actix/actix-web/pull/2565
## 4.0.0-beta.18 - 2021-12-29 ## 4.0.0-beta.18 - 2021-12-29

3
tests/compression.rs
View File

@ -55,7 +55,6 @@ macro_rules! test_server {
web::to(|| { web::to(|| {
HttpResponse::Ok() HttpResponse::Ok()
// signal to compressor that content should not be altered // signal to compressor that content should not be altered
// .encode_with(ContentEncoding::Identity)
// signal to client that content is encoded as 7zip // signal to client that content is encoded as 7zip
.insert_header((header::CONTENT_ENCODING, "xz")) .insert_header((header::CONTENT_ENCODING, "xz"))
.body(LOREM_XZ) .body(LOREM_XZ)
@ -112,7 +111,7 @@ async fn negotiate_encoding_gzip() {
.await .await
.unwrap(); .unwrap();
let bytes = res.body().await.unwrap(); let bytes = res.body().await.unwrap();
assert_eq!(gzip::decode(bytes), LOREM); assert_eq!(utils::gzip::decode(bytes), LOREM);
srv.stop().await; srv.stop().await;
} }

50
tests/test_server.rs
View File

@ -28,7 +28,6 @@ use openssl::{
}; };
mod utils; mod utils;
use utils::{brotli, deflate, gzip, zstd};
const S: &str = "Hello World "; const S: &str = "Hello World ";
const STR: &str = const_str::repeat!(S, 100); const STR: &str = const_str::repeat!(S, 100);
@ -135,7 +134,7 @@ async fn test_body() {
// assert_eq!(res.status(), StatusCode::OK); // assert_eq!(res.status(), StatusCode::OK);
// let bytes = res.body().await.unwrap(); // let bytes = res.body().await.unwrap();
// assert_eq!(deflate::decode(bytes), STR.as_bytes()); // assert_eq!(utils::deflate::decode(bytes), STR.as_bytes());
// // Raw Response // // Raw Response
// let mut res = srv // let mut res = srv
@ -148,7 +147,7 @@ async fn test_body() {
// assert_eq!(res.status(), StatusCode::OK); // assert_eq!(res.status(), StatusCode::OK);
// let bytes = res.body().await.unwrap(); // let bytes = res.body().await.unwrap();
// assert_eq!(deflate::decode(bytes), STR.as_bytes()); // assert_eq!(utils::deflate::decode(bytes), STR.as_bytes());
// srv.stop().await; // srv.stop().await;
// } // }
@ -176,7 +175,7 @@ async fn body_gzip_large() {
assert_eq!(res.status(), StatusCode::OK); assert_eq!(res.status(), StatusCode::OK);
let bytes = res.body().await.unwrap(); let bytes = res.body().await.unwrap();
assert_eq!(gzip::decode(bytes), data.as_bytes()); assert_eq!(utils::gzip::decode(bytes), data.as_bytes());
srv.stop().await; srv.stop().await;
} }
@ -207,7 +206,7 @@ async fn test_body_gzip_large_random() {
assert_eq!(res.status(), StatusCode::OK); assert_eq!(res.status(), StatusCode::OK);
let bytes = res.body().await.unwrap(); let bytes = res.body().await.unwrap();
assert_eq!(gzip::decode(bytes), data.as_bytes()); assert_eq!(utils::gzip::decode(bytes), data.as_bytes());
srv.stop().await; srv.stop().await;
} }
@ -237,7 +236,7 @@ async fn test_body_chunked_implicit() {
); );
let bytes = res.body().await.unwrap(); let bytes = res.body().await.unwrap();
assert_eq!(gzip::decode(bytes), STR.as_bytes()); assert_eq!(utils::gzip::decode(bytes), STR.as_bytes());
srv.stop().await; srv.stop().await;
} }
@ -263,7 +262,7 @@ async fn test_body_br_streaming() {
assert_eq!(res.status(), StatusCode::OK); assert_eq!(res.status(), StatusCode::OK);
let bytes = res.body().await.unwrap(); let bytes = res.body().await.unwrap();
assert_eq!(brotli::decode(bytes), STR.as_bytes()); assert_eq!(utils::brotli::decode(bytes), STR.as_bytes());
srv.stop().await; srv.stop().await;
} }
@ -326,7 +325,7 @@ async fn test_body_deflate() {
assert_eq!(res.status(), StatusCode::OK); assert_eq!(res.status(), StatusCode::OK);
let bytes = res.body().await.unwrap(); let bytes = res.body().await.unwrap();
assert_eq!(deflate::decode(bytes), STR.as_bytes()); assert_eq!(utils::deflate::decode(bytes), STR.as_bytes());
srv.stop().await; srv.stop().await;
} }
@ -349,7 +348,7 @@ async fn test_body_brotli() {
assert_eq!(res.status(), StatusCode::OK); assert_eq!(res.status(), StatusCode::OK);
let bytes = res.body().await.unwrap(); let bytes = res.body().await.unwrap();
assert_eq!(brotli::decode(bytes), STR.as_bytes()); assert_eq!(utils::brotli::decode(bytes), STR.as_bytes());
srv.stop().await; srv.stop().await;
} }
@ -372,7 +371,7 @@ async fn test_body_zstd() {
assert_eq!(res.status(), StatusCode::OK); assert_eq!(res.status(), StatusCode::OK);
let bytes = res.body().await.unwrap(); let bytes = res.body().await.unwrap();
assert_eq!(zstd::decode(bytes), STR.as_bytes()); assert_eq!(utils::zstd::decode(bytes), STR.as_bytes());
srv.stop().await; srv.stop().await;
} }
@ -398,7 +397,7 @@ async fn test_body_zstd_streaming() {
assert_eq!(res.status(), StatusCode::OK); assert_eq!(res.status(), StatusCode::OK);
let bytes = res.body().await.unwrap(); let bytes = res.body().await.unwrap();
assert_eq!(zstd::decode(bytes), STR.as_bytes()); assert_eq!(utils::zstd::decode(bytes), STR.as_bytes());
srv.stop().await; srv.stop().await;
} }
@ -414,7 +413,7 @@ async fn test_zstd_encoding() {
let request = srv let request = srv
.post("/") .post("/")
.append_header((header::CONTENT_ENCODING, "zstd")) .append_header((header::CONTENT_ENCODING, "zstd"))
.send_body(zstd::encode(STR)); .send_body(utils::zstd::encode(STR));
let mut res = request.await.unwrap(); let mut res = request.await.unwrap();
assert_eq!(res.status(), StatusCode::OK); assert_eq!(res.status(), StatusCode::OK);
@ -445,7 +444,7 @@ async fn test_zstd_encoding_large() {
let request = srv let request = srv
.post("/") .post("/")
.append_header((header::CONTENT_ENCODING, "zstd")) .append_header((header::CONTENT_ENCODING, "zstd"))
.send_body(zstd::encode(&data)); .send_body(utils::zstd::encode(&data));
let mut res = request.await.unwrap(); let mut res = request.await.unwrap();
assert_eq!(res.status(), StatusCode::OK); assert_eq!(res.status(), StatusCode::OK);
@ -466,7 +465,7 @@ async fn test_encoding() {
let request = srv let request = srv
.post("/") .post("/")
.insert_header((header::CONTENT_ENCODING, "gzip")) .insert_header((header::CONTENT_ENCODING, "gzip"))
.send_body(gzip::encode(STR)); .send_body(utils::gzip::encode(STR));
let mut res = request.await.unwrap(); let mut res = request.await.unwrap();
assert_eq!(res.status(), StatusCode::OK); assert_eq!(res.status(), StatusCode::OK);
@ -487,7 +486,7 @@ async fn test_gzip_encoding() {
let request = srv let request = srv
.post("/") .post("/")
.append_header((header::CONTENT_ENCODING, "gzip")) .append_header((header::CONTENT_ENCODING, "gzip"))
.send_body(gzip::encode(STR)); .send_body(utils::gzip::encode(STR));
let mut res = request.await.unwrap(); let mut res = request.await.unwrap();
assert_eq!(res.status(), StatusCode::OK); assert_eq!(res.status(), StatusCode::OK);
@ -509,7 +508,7 @@ async fn test_gzip_encoding_large() {
let req = srv let req = srv
.post("/") .post("/")
.append_header((header::CONTENT_ENCODING, "gzip")) .append_header((header::CONTENT_ENCODING, "gzip"))
.send_body(gzip::encode(&data)); .send_body(utils::gzip::encode(&data));
let mut res = req.await.unwrap(); let mut res = req.await.unwrap();
assert_eq!(res.status(), StatusCode::OK); assert_eq!(res.status(), StatusCode::OK);
@ -536,7 +535,7 @@ async fn test_reading_gzip_encoding_large_random() {
let request = srv let request = srv
.post("/") .post("/")
.append_header((header::CONTENT_ENCODING, "gzip")) .append_header((header::CONTENT_ENCODING, "gzip"))
.send_body(gzip::encode(&data)); .send_body(utils::gzip::encode(&data));
let mut res = request.await.unwrap(); let mut res = request.await.unwrap();
assert_eq!(res.status(), StatusCode::OK); assert_eq!(res.status(), StatusCode::OK);
@ -557,7 +556,7 @@ async fn test_reading_deflate_encoding() {
let request = srv let request = srv
.post("/") .post("/")
.append_header((header::CONTENT_ENCODING, "deflate")) .append_header((header::CONTENT_ENCODING, "deflate"))
.send_body(deflate::encode(STR)); .send_body(utils::deflate::encode(STR));
let mut res = request.await.unwrap(); let mut res = request.await.unwrap();
assert_eq!(res.status(), StatusCode::OK); assert_eq!(res.status(), StatusCode::OK);
@ -579,7 +578,7 @@ async fn test_reading_deflate_encoding_large() {
let request = srv let request = srv
.post("/") .post("/")
.append_header((header::CONTENT_ENCODING, "deflate")) .append_header((header::CONTENT_ENCODING, "deflate"))
.send_body(deflate::encode(&data)); .send_body(utils::deflate::encode(&data));
let mut res = request.await.unwrap(); let mut res = request.await.unwrap();
assert_eq!(res.status(), StatusCode::OK); assert_eq!(res.status(), StatusCode::OK);
@ -606,7 +605,7 @@ async fn test_reading_deflate_encoding_large_random() {
let request = srv let request = srv
.post("/") .post("/")
.append_header((header::CONTENT_ENCODING, "deflate")) .append_header((header::CONTENT_ENCODING, "deflate"))
.send_body(deflate::encode(&data)); .send_body(utils::deflate::encode(&data));
let mut res = request.await.unwrap(); let mut res = request.await.unwrap();
assert_eq!(res.status(), StatusCode::OK); assert_eq!(res.status(), StatusCode::OK);
@ -628,7 +627,7 @@ async fn test_brotli_encoding() {
let request = srv let request = srv
.post("/") .post("/")
.append_header((header::CONTENT_ENCODING, "br")) .append_header((header::CONTENT_ENCODING, "br"))
.send_body(brotli::encode(STR)); .send_body(utils::brotli::encode(STR));
let mut res = request.await.unwrap(); let mut res = request.await.unwrap();
assert_eq!(res.status(), StatusCode::OK); assert_eq!(res.status(), StatusCode::OK);
@ -659,7 +658,7 @@ async fn test_brotli_encoding_large() {
let request = srv let request = srv
.post("/") .post("/")
.append_header((header::CONTENT_ENCODING, "br")) .append_header((header::CONTENT_ENCODING, "br"))
.send_body(brotli::encode(&data)); .send_body(utils::brotli::encode(&data));
let mut res = request.await.unwrap(); let mut res = request.await.unwrap();
assert_eq!(res.status(), StatusCode::OK); assert_eq!(res.status(), StatusCode::OK);
@ -688,7 +687,7 @@ async fn test_brotli_encoding_large_openssl() {
let mut res = srv let mut res = srv
.post("/") .post("/")
.append_header((header::CONTENT_ENCODING, "br")) .append_header((header::CONTENT_ENCODING, "br"))
.send_body(brotli::encode(&data)) .send_body(utils::brotli::encode(&data))
.await .await
.unwrap(); .unwrap();
assert_eq!(res.status(), StatusCode::OK); assert_eq!(res.status(), StatusCode::OK);
@ -750,7 +749,10 @@ mod plus_rustls {
let req = srv let req = srv
.post("/") .post("/")
.insert_header((header::CONTENT_ENCODING, "deflate")) .insert_header((header::CONTENT_ENCODING, "deflate"))
.send_stream(TestBody::new(Bytes::from(deflate::encode(&data)), 1024)); .send_stream(TestBody::new(
Bytes::from(utils::deflate::encode(&data)),
1024,
));
let mut res = req.await.unwrap(); let mut res = req.await.unwrap();
assert_eq!(res.status(), StatusCode::OK); assert_eq!(res.status(), StatusCode::OK);