OpenSource/axum
OpenSource/axum
1
0
Fork 0
mirror of https://github.com/tokio-rs/axum.git synced 2024-11-21 22:56:46 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove h2 from dependencies when http2 feature is off (#2605)

Browse source
This commit is contained in:
David Mládek 2024-03-16 16:57:08 +01:00 committed by GitHub
parent 8b13d4cf3c
commit 2ce382f0ab
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
axum/CHANGELOG.md
View file

@ -9,8 +9,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- **fixed:** Fixed layers being cloned when calling `axum::serve` directly with - **fixed:** Fixed layers being cloned when calling `axum::serve` directly with
a `Router` or `MethodRouter` ([#2586]) a `Router` or `MethodRouter` ([#2586])
- **fixed:** `h2` is no longer pulled as a dependency unless the `http2` feature
is enabled ([#2605])
[#2586]: https://github.com/tokio-rs/axum/pull/2586 [#2586]: https://github.com/tokio-rs/axum/pull/2586
[#2605]: https://github.com/tokio-rs/axum/pull/2605
# 0.7.4 (13. January, 2024) # 0.7.4 (13. January, 2024)

6
axum/Cargo.toml
View file

@ -24,8 +24,8 @@ default = [
"tracing", "tracing",
] ]
form = ["dep:serde_urlencoded"] form = ["dep:serde_urlencoded"]
http1 = ["dep:hyper", "hyper?/http1"] http1 = ["dep:hyper", "hyper?/http1", "hyper-util?/http1"]
http2 = ["dep:hyper", "hyper?/http2"] http2 = ["dep:hyper", "hyper?/http2", "hyper-util?/http2"]
json = ["dep:serde_json", "dep:serde_path_to_error"] json = ["dep:serde_json", "dep:serde_path_to_error"]
macros = ["dep:axum-macros"] macros = ["dep:axum-macros"]
matched-path = [] matched-path = []
@ -64,7 +64,7 @@ tower-service = "0.3"
axum-macros = { path = "../axum-macros", version = "0.4.1", optional = true } axum-macros = { path = "../axum-macros", version = "0.4.1", optional = true }
base64 = { version = "0.21.0", optional = true } base64 = { version = "0.21.0", optional = true }
hyper = { version = "1.1.0", optional = true } hyper = { version = "1.1.0", optional = true }
hyper-util = { version = "0.1.2", features = ["tokio", "server", "server-auto"], optional = true } hyper-util = { version = "0.1.3", features = ["tokio", "server"], optional = true }
multer = { version = "3.0.0", optional = true } multer = { version = "3.0.0", optional = true }
serde_json = { version = "1.0", features = ["raw_value"], optional = true } serde_json = { version = "1.0", features = ["raw_value"], optional = true }
serde_path_to_error = { version = "0.1.8", optional = true } serde_path_to_error = { version = "0.1.8", optional = true }

7
axum/src/serve.rs
View file

@ -16,10 +16,9 @@ use std::{
use axum_core::{body::Body, extract::Request, response::Response}; use axum_core::{body::Body, extract::Request, response::Response};
use futures_util::{pin_mut, FutureExt}; use futures_util::{pin_mut, FutureExt};
use hyper::body::Incoming; use hyper::body::Incoming;
use hyper_util::{ use hyper_util::rt::{TokioExecutor, TokioIo};
rt::{TokioExecutor, TokioIo}, #[cfg(any(feature = "http1", feature = "http2"))]
server::conn::auto::Builder, use hyper_util::server::conn::auto::Builder;
};
use pin_project_lite::pin_project; use pin_project_lite::pin_project;
use tokio::{ use tokio::{
net::{TcpListener, TcpStream}, net::{TcpListener, TcpStream},