Skip to content

add alpn support #107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 27, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -11,6 +11,7 @@ documentation = "https://docs.rs/hyper-tls"
edition = "2018"

[features]
alpn = ["native-tls/alpn"]
vendored = ["native-tls/vendored"]

[dependencies]
4 changes: 4 additions & 0 deletions src/lib.rs
Original file line number Diff line number Diff line change
@@ -22,6 +22,10 @@
//! Ok(())
//! }
//! ```
//!
//! ## Crate Features
//!
//! - `alpn`: Enables `native-tls/alpn`, and if `h2` is negotiated, tells hyper.
#![doc(html_root_url = "https://docs.rs/hyper-tls/0.5.0")]
#![cfg_attr(test, deny(warnings))]
#![deny(missing_docs)]
19 changes: 17 additions & 2 deletions src/stream.rs
Original file line number Diff line number Diff line change
@@ -111,13 +111,28 @@ impl<T: Write + Read + Unpin> Write for MaybeHttpsStream<T> {
}
}

impl<T: Connection + Unpin> Connection for MaybeHttpsStream<T> {
impl<T: Write + Read + Connection + Unpin> Connection for MaybeHttpsStream<T> {
fn connected(&self) -> Connected {
match self {
MaybeHttpsStream::Http(s) => s.connected(),
MaybeHttpsStream::Https(s) => {
s.inner().get_ref().get_ref().get_ref().inner().connected()
let c = s.inner().get_ref().get_ref().get_ref().inner().connected();
#[cfg(feature = "alpn")]
{
if negotiated_h2(s.inner().get_ref()) {
return c.negotiated_h2();
}
}
c
}
}
}
}

#[cfg(feature = "alpn")]
fn negotiated_h2<T: std::io::Read + std::io::Write>(s: &native_tls::TlsStream<T>) -> bool {
s.negotiated_alpn()
.unwrap_or(None)
.map(|list| list == &b"h2"[..])
.unwrap_or(false)
}