* rc.2

* don't bump version of axum-macros

* fix

* Update axum/Cargo.toml

Co-authored-by: Jonas Platte <jplatte+git@posteo.de>

* undo release of axum-extra

* fix

Co-authored-by: Jonas Platte <jplatte+git@posteo.de>
This commit is contained in:
David Pedersen 2022-09-11 16:42:04 +02:00 committed by GitHub
parent 759e988747
commit 54d8439e35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 21 additions and 13 deletions

View File

@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
# Unreleased # Unreleased
- None.
# 0.3.0-rc.2 (10. September, 2022)
- **breaking:** Added default limit to how much data `Bytes::from_request` will - **breaking:** Added default limit to how much data `Bytes::from_request` will
consume. Previously it would attempt to consume the entire request body consume. Previously it would attempt to consume the entire request body
without checking its length. This meant if a malicious peer sent an large (or without checking its length. This meant if a malicious peer sent an large (or

View File

@ -9,7 +9,7 @@ license = "MIT"
name = "axum-core" name = "axum-core"
readme = "README.md" readme = "README.md"
repository = "https://github.com/tokio-rs/axum" repository = "https://github.com/tokio-rs/axum"
version = "0.3.0-rc.1" # remember to also bump the version that axum depends on version = "0.3.0-rc.2" # remember to also bump the version that axum depends on
[dependencies] [dependencies]
async-trait = "0.1" async-trait = "0.1"
@ -22,7 +22,7 @@ tower-layer = "0.3"
tower-service = "0.3" tower-service = "0.3"
[dev-dependencies] [dev-dependencies]
axum = { path = "../axum", version = "0.6.0-rc.1" } axum = { path = "../axum", version = "0.6.0-rc.2" }
futures-util = "0.3" futures-util = "0.3"
hyper = "0.14" hyper = "0.14"
tokio = { version = "1.0", features = ["macros"] } tokio = { version = "1.0", features = ["macros"] }

View File

@ -13,8 +13,8 @@ use tower_layer::Layer;
/// ///
/// [`Body::data`]: http_body::Body::data /// [`Body::data`]: http_body::Body::data
/// [`Bytes`]: bytes::Bytes /// [`Bytes`]: bytes::Bytes
/// [`Json`]: https://docs.rs/axum/0.6.0-rc.1/axum/struct.Json.html /// [`Json`]: https://docs.rs/axum/0.6.0-rc.2/axum/struct.Json.html
/// [`Form`]: https://docs.rs/axum/0.6.0-rc.1/axum/struct.Form.html /// [`Form`]: https://docs.rs/axum/0.6.0-rc.2/axum/struct.Form.html
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
#[non_exhaustive] #[non_exhaustive]
pub struct DefaultBodyLimit; pub struct DefaultBodyLimit;
@ -50,8 +50,8 @@ impl DefaultBodyLimit {
/// ///
/// [`tower_http::limit`]: https://docs.rs/tower-http/0.3.4/tower_http/limit/index.html /// [`tower_http::limit`]: https://docs.rs/tower-http/0.3.4/tower_http/limit/index.html
/// [`Bytes`]: bytes::Bytes /// [`Bytes`]: bytes::Bytes
/// [`Json`]: https://docs.rs/axum/0.6.0-rc.1/axum/struct.Json.html /// [`Json`]: https://docs.rs/axum/0.6.0-rc.2/axum/struct.Json.html
/// [`Form`]: https://docs.rs/axum/0.6.0-rc.1/axum/struct.Form.html /// [`Form`]: https://docs.rs/axum/0.6.0-rc.2/axum/struct.Form.html
pub fn disable() -> Self { pub fn disable() -> Self {
Self Self
} }

View File

@ -36,7 +36,7 @@ mod private {
/// ///
/// See [`axum::extract`] for more general docs about extraxtors. /// See [`axum::extract`] for more general docs about extraxtors.
/// ///
/// [`axum::extract`]: https://docs.rs/axum/0.6.0-rc.1/axum/extract/index.html /// [`axum::extract`]: https://docs.rs/axum/0.6.0-rc.2/axum/extract/index.html
#[async_trait] #[async_trait]
pub trait FromRequestParts<S>: Sized { pub trait FromRequestParts<S>: Sized {
/// If the extractor fails it'll use this "rejection" type. A rejection is /// If the extractor fails it'll use this "rejection" type. A rejection is
@ -99,7 +99,7 @@ pub trait FromRequestParts<S>: Sized {
/// This ensures your extractor is as flexible as possible. /// This ensures your extractor is as flexible as possible.
/// ///
/// [`http::Request<B>`]: http::Request /// [`http::Request<B>`]: http::Request
/// [`axum::extract`]: https://docs.rs/axum/0.6.0-rc.1/axum/extract/index.html /// [`axum::extract`]: https://docs.rs/axum/0.6.0-rc.2/axum/extract/index.html
#[async_trait] #[async_trait]
pub trait FromRequest<S, B, M = private::ViaRequest>: Sized { pub trait FromRequest<S, B, M = private::ViaRequest>: Sized {
/// If the extractor fails it'll use this "rejection" type. A rejection is /// If the extractor fails it'll use this "rejection" type. A rejection is

View File

@ -34,7 +34,7 @@ spa = ["tower-http/fs"]
typed-routing = ["dep:axum-macros", "dep:serde", "dep:percent-encoding"] typed-routing = ["dep:axum-macros", "dep:serde", "dep:percent-encoding"]
[dependencies] [dependencies]
axum = { path = "../axum", version = "0.6.0-rc.1", default-features = false } axum = { path = "../axum", version = "0.6.0-rc.2", default-features = false }
bytes = "1.1.0" bytes = "1.1.0"
futures-util = { version = "0.3", default-features = false, features = ["alloc"] } futures-util = { version = "0.3", default-features = false, features = ["alloc"] }
http = "0.2" http = "0.2"
@ -58,7 +58,7 @@ tokio-stream = { version = "0.1.9", optional = true }
tokio-util = { version = "0.7", optional = true } tokio-util = { version = "0.7", optional = true }
[dev-dependencies] [dev-dependencies]
axum = { path = "../axum", version = "0.6.0-rc.1", features = ["headers"] } axum = { path = "../axum", version = "0.6.0-rc.2", features = ["headers"] }
futures = "0.3" futures = "0.3"
hyper = "0.14" hyper = "0.14"
reqwest = { version = "0.11", default-features = false, features = ["json", "stream", "multipart"] } reqwest = { version = "0.11", default-features = false, features = ["json", "stream", "multipart"] }

View File

@ -25,7 +25,7 @@ syn = { version = "1.0", features = [
] } ] }
[dev-dependencies] [dev-dependencies]
axum = { path = "../axum", version = "0.6.0-rc.1", features = ["headers"] } axum = { path = "../axum", version = "0.6.0-rc.2", features = ["headers"] }
axum-extra = { path = "../axum-extra", version = "0.4.0-rc.1", features = ["typed-routing"] } axum-extra = { path = "../axum-extra", version = "0.4.0-rc.1", features = ["typed-routing"] }
rustversion = "1.0" rustversion = "1.0"
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }

View File

@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
# Unreleased # Unreleased
- None.
# 0.6.0-rc.2 (10. September, 2022)
## Security ## Security
- **breaking:** Added default limit to how much data `Bytes::from_request` will - **breaking:** Added default limit to how much data `Bytes::from_request` will

View File

@ -1,6 +1,6 @@
[package] [package]
name = "axum" name = "axum"
version = "0.6.0-rc.1" version = "0.6.0-rc.2"
categories = ["asynchronous", "network-programming", "web-programming::http-server"] categories = ["asynchronous", "network-programming", "web-programming::http-server"]
description = "Web framework that focuses on ergonomics and modularity" description = "Web framework that focuses on ergonomics and modularity"
edition = "2021" edition = "2021"
@ -30,7 +30,7 @@ __private_docs = ["tower/full", "tower-http/full"]
[dependencies] [dependencies]
async-trait = "0.1.43" async-trait = "0.1.43"
axum-core = { path = "../axum-core", version = "0.3.0-rc.1" } axum-core = { path = "../axum-core", version = "=0.3.0-rc.2" }
bitflags = "1.0" bitflags = "1.0"
bytes = "1.0" bytes = "1.0"
futures-util = { version = "0.3", default-features = false, features = ["alloc"] } futures-util = { version = "0.3", default-features = false, features = ["alloc"] }