Add HTTP/1 and HTTP/2 to axum::serve (#2241)

axum/Cargo.toml

@@ -22,7 +22,7 @@ matched-path = []
 multipart = ["dep:multer"]
 original-uri = []
 query = ["dep:serde_urlencoded"]
-tokio = ["dep:tokio", "hyper/server", "hyper/tcp", "hyper/runtime", "tower/make"]
+tokio = ["dep:tokio", "dep:hyper-util", "hyper/server", "hyper/tcp", "hyper/runtime", "tower/make"]
 tower-log = ["tower/log"]
 tracing = ["dep:tracing", "axum-core/tracing"]
 ws = ["tokio", "dep:tokio-tungstenite", "dep:sha1", "dep:base64"]
@@ -51,12 +51,13 @@ tower-layer = "0.3.2"
 tower-service = "0.3"
 
 # wont need this when axum uses http-body 1.0
-hyper1 = { package = "hyper", version = "=1.0.0-rc.4", features = ["server", "http1"] }
+hyper1 = { package = "hyper", version = "=1.0.0-rc.4", features = ["server", "http1", "http2"] }
 tower-hyper-http-body-compat = { version = "0.2", features = ["server", "http1"] }
 
 # optional dependencies
 axum-macros = { path = "../axum-macros", version = "0.3.7", optional = true }
 base64 = { version = "0.21.0", optional = true }
+hyper-util = { git = "https://github.com/hyperium/hyper-util", rev = "d97181a", features = ["auto"], optional = true }
 multer = { version = "2.0.0", optional = true }
 serde_json = { version = "1.0", features = ["raw_value"], optional = true }
 serde_path_to_error = { version = "0.1.8", optional = true }

axum/src/extract/ws.rs

@@ -92,7 +92,7 @@
 
 use self::rejection::*;
 use super::FromRequestParts;
-use crate::{body::Bytes, hyper1_tokio_io::TokioIo, response::Response, Error};
+use crate::{body::Bytes, response::Response, Error};
 use async_trait::async_trait;
 use axum_core::body::Body;
 use futures_util::{
@@ -104,6 +104,7 @@ use http::{
     request::Parts,
     Method, StatusCode,
 };
+use hyper_util::rt::TokioIo;
 use sha1::{Digest, Sha1};
 use std::{
     borrow::Cow,

axum/src/lib.rs

@@ -432,8 +432,6 @@ mod boxed;
 mod extension;
 #[cfg(feature = "form")]
 mod form;
-#[cfg(feature = "tokio")]
-mod hyper1_tokio_io;
 #[cfg(feature = "json")]
 mod json;
 mod service_ext;

axum/src/serve.rs

@@ -2,10 +2,12 @@
 
 use std::{convert::Infallible, io, net::SocketAddr};
 
-use crate::hyper1_tokio_io::TokioIo;
 use axum_core::{body::Body, extract::Request, response::Response};
 use futures_util::{future::poll_fn, FutureExt};
-use hyper1::server::conn::http1;
+use hyper_util::{
+    rt::{TokioExecutor, TokioIo},
+    server::conn::auto::Builder,
+};
 use tokio::net::{TcpListener, TcpStream};
 use tower_hyper_http_body_compat::{HttpBody04ToHttpBody1, HttpBody1ToHttpBody04};
 use tower_service::Service;
@@ -15,7 +17,7 @@ use tower_service::Service;
 /// This method of running a service is intentionally simple and doesn't support any configuration.
 /// Use hyper or hyper-util if you need configuration.
 ///
-/// It only supports HTTP/1.
+/// It supports both HTTP/1 as well as HTTP/2.
 ///
 /// # Examples
 ///
@@ -138,10 +140,9 @@ where
         });
 
         tokio::task::spawn(async move {
-            match http1::Builder::new()
-                .serve_connection(tcp_stream, service)
-                // for websockets
-                .with_upgrades()
+            match Builder::new(TokioExecutor::new())
+                // upgrades needed for websockets
+                .serve_connection_with_upgrades(tcp_stream.into_inner(), service)
                 .await
             {
                 Ok(()) => {}