Enable ALPN for native-tls users #1283
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
seanmonstar
requested changes
Jun 9, 2021
Cargo.toml
Outdated
| @@ -30,7 +30,7 @@ default = ["default-tls"] | |||
|
|
|||
| # Note: this doesn't enable the 'native-tls' feature, which adds specific | |||
| # functionality for it. | |||
| default-tls = ["hyper-tls", "native-tls-crate", "__tls", "tokio-native-tls"] | |||
| default-tls = ["hyper-tls", "native-tls-crate", "native-tls-crate/alpn", "__tls", "tokio-native-tls"] | |||
There was a problem hiding this comment.
I think enabling this by default could be a breaking change, because it will try to access new symbols in the linked libraries that may not exist. I wish the feature could be made to check at runtime, but it currently doesn't.
So, we'd probably need a separate native-tls-alpn feature in reqwest. Unless there's a better option?
src/connect.rs
Outdated
| @@ -687,7 +691,16 @@ mod native_tls_conn { | |||
|
|
|||
| impl<T: Connection + AsyncRead + AsyncWrite + Unpin> Connection for NativeTlsConn<T> { | |||
| fn connected(&self) -> Connected { | |||
| self.inner.get_ref().get_ref().get_ref().connected() | |||
| if self.inner.get_ref().negotiated_alpn().ok() == Some(Some(b"h2".to_vec())) { | |||
There was a problem hiding this comment.
This will allocate a small vector before doing the comparison, we could just compare the slices with some more pattern matching.
seanmonstar
reviewed
Jun 9, 2021
seanmonstar
approved these changes
Jun 10, 2021
pfernie
added a commit
to pfernie/reqwest
that referenced
this pull request
Jun 25, 2021
* master: add option to disable http2 upgrade (seanmonstar#1292) Fix documentation of http1_title_case_headers() (seanmonstar#1294) CI: make a single final job that depends on all others (seanmonstar#1291) Fix bare url warnings in `multipart` docs (seanmonstar#1289) v0.11.4 Allow overriding of DNS resolution to specified IP addresses(seanmonstar#561) (seanmonstar#1277) WASM: Add `try_clone` implementations to `Request` and `RequestBuilder` (seanmonstar#1286) Add native-tls-alpn feature (seanmonstar#1283)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Thanks to sfackler/rust-native-tls#194, native-tls v0.2.7 now supports ALPN. This should allow native-tls users to initiate an HTTP2 connection without prior knowledge.
Resolves remaining bits of #292