feat(http2): Make HTTP/2 support an optional feature
cc #2251 BREAKING CHANGE: This puts all HTTP/2 methods and support behind an `http2` cargo feature, which will not be enabled by default. To use HTTP/2, add `features = ["http2"]` to the hyper dependency in your `Cargo.toml`.
This commit is contained in:
@@ -4,6 +4,7 @@ use std::pin::Pin;
|
||||
use std::sync::Arc;
|
||||
|
||||
use crate::body::{Body, HttpBody};
|
||||
#[cfg(feature = "http2")]
|
||||
use crate::proto::h2::server::H2Stream;
|
||||
use crate::server::conn::spawn_all::{NewSvcTask, Watcher};
|
||||
use crate::service::HttpService;
|
||||
@@ -14,7 +15,7 @@ pub trait Executor<Fut> {
|
||||
fn execute(&self, fut: Fut);
|
||||
}
|
||||
|
||||
pub trait H2Exec<F, B: HttpBody>: Clone {
|
||||
pub trait ConnStreamExec<F, B: HttpBody>: Clone {
|
||||
fn execute_h2stream(&mut self, fut: H2Stream<F, B>);
|
||||
}
|
||||
|
||||
@@ -64,7 +65,7 @@ impl fmt::Debug for Exec {
|
||||
}
|
||||
}
|
||||
|
||||
impl<F, B> H2Exec<F, B> for Exec
|
||||
impl<F, B> ConnStreamExec<F, B> for Exec
|
||||
where
|
||||
H2Stream<F, B>: Future<Output = ()> + Send + 'static,
|
||||
B: HttpBody,
|
||||
@@ -87,7 +88,7 @@ where
|
||||
|
||||
// ==== impl Executor =====
|
||||
|
||||
impl<E, F, B> H2Exec<F, B> for E
|
||||
impl<E, F, B> ConnStreamExec<F, B> for E
|
||||
where
|
||||
E: Executor<H2Stream<F, B>> + Clone,
|
||||
H2Stream<F, B>: Future<Output = ()>,
|
||||
@@ -109,3 +110,30 @@ where
|
||||
self.execute(fut)
|
||||
}
|
||||
}
|
||||
|
||||
// If http2 is not enable, we just have a stub here, so that the trait bounds
|
||||
// that *would* have been needed are still checked. Why?
|
||||
//
|
||||
// Because enabling `http2` shouldn't suddenly add new trait bounds that cause
|
||||
// a compilation error.
|
||||
#[cfg(not(feature = "http2"))]
|
||||
#[allow(missing_debug_implementations)]
|
||||
pub struct H2Stream<F, B>(std::marker::PhantomData<(F, B)>);
|
||||
|
||||
#[cfg(not(feature = "http2"))]
|
||||
impl<F, B, E> Future for H2Stream<F, B>
|
||||
where
|
||||
F: Future<Output = Result<http::Response<B>, E>>,
|
||||
B: HttpBody,
|
||||
B::Error: Into<Box<dyn std::error::Error + Send + Sync>>,
|
||||
E: Into<Box<dyn std::error::Error + Send + Sync>>,
|
||||
{
|
||||
type Output = ();
|
||||
|
||||
fn poll(
|
||||
self: Pin<&mut Self>,
|
||||
_cx: &mut std::task::Context<'_>,
|
||||
) -> std::task::Poll<Self::Output> {
|
||||
unreachable!()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -14,6 +14,7 @@ pub(crate) struct Rewind<T> {
|
||||
}
|
||||
|
||||
impl<T> Rewind<T> {
|
||||
#[cfg(any(feature = "http2", test))]
|
||||
pub(crate) fn new(io: T) -> Self {
|
||||
Rewind {
|
||||
pre: None,
|
||||
@@ -28,6 +29,7 @@ impl<T> Rewind<T> {
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(any(feature = "http2", test))]
|
||||
pub(crate) fn rewind(&mut self, bs: Bytes) {
|
||||
debug_assert!(self.pre.is_none());
|
||||
self.pre = Some(bs);
|
||||
|
||||
Reference in New Issue
Block a user