Skip to content

Commit 373d193

Browse files
authored
add alpn support (#107)
1 parent 95ebd8d commit 373d193

File tree

3 files changed

+22
-2
lines changed

3 files changed

+22
-2
lines changed

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ documentation = "https://docs.rs/hyper-tls"
1111
edition = "2018"
1212

1313
[features]
14+
alpn = ["native-tls/alpn"]
1415
vendored = ["native-tls/vendored"]
1516

1617
[dependencies]

src/lib.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@
2222
//! Ok(())
2323
//! }
2424
//! ```
25+
//!
26+
//! ## Crate Features
27+
//!
28+
//! - `alpn`: Enables `native-tls/alpn`, and if `h2` is negotiated, tells hyper.
2529
#![doc(html_root_url = "https://docs.rs/hyper-tls/0.5.0")]
2630
#![cfg_attr(test, deny(warnings))]
2731
#![deny(missing_docs)]

src/stream.rs

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,13 +111,28 @@ impl<T: Write + Read + Unpin> Write for MaybeHttpsStream<T> {
111111
}
112112
}
113113

114-
impl<T: Connection + Unpin> Connection for MaybeHttpsStream<T> {
114+
impl<T: Write + Read + Connection + Unpin> Connection for MaybeHttpsStream<T> {
115115
fn connected(&self) -> Connected {
116116
match self {
117117
MaybeHttpsStream::Http(s) => s.connected(),
118118
MaybeHttpsStream::Https(s) => {
119-
s.inner().get_ref().get_ref().get_ref().inner().connected()
119+
let c = s.inner().get_ref().get_ref().get_ref().inner().connected();
120+
#[cfg(feature = "alpn")]
121+
{
122+
if negotiated_h2(s.inner().get_ref()) {
123+
return c.negotiated_h2();
124+
}
125+
}
126+
c
120127
}
121128
}
122129
}
123130
}
131+
132+
#[cfg(feature = "alpn")]
133+
fn negotiated_h2<T: std::io::Read + std::io::Write>(s: &native_tls::TlsStream<T>) -> bool {
134+
s.negotiated_alpn()
135+
.unwrap_or(None)
136+
.map(|list| list == &b"h2"[..])
137+
.unwrap_or(false)
138+
}

0 commit comments

Comments
 (0)