darwinssl: add support for ALPN negotiation #2731
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
nickzman
requested changes
Jul 12, 2018
lib/vtls/darwinssl.c
Outdated
| @@ -1573,6 +1573,35 @@ static CURLcode darwinssl_connect_step1(struct connectdata *conn, | |||
| } | |||
| #endif /* CURL_BUILD_MAC_10_8 || CURL_BUILD_IOS */ | |||
|
|
|||
| #if (CURL_BUILD_MAC_10_13 || CURL_BUILD_IOS_11) && HAVE_BUILTIN_AVAILABLE == 1 | |||
| if(conn->bits.tls_enable_alpn) { | |||
| if(__builtin_available(macOS 10.13, iOS 11, *)) { | |||
There was a problem hiding this comment.
Throughout this code, we need to be checking for macOS 10.13.4 or later. When 10.13 was first released, it had both ALPN functions defined in the header, but the implementations were actually missing from the framework. Apple fixed that in 10.13.4.
docs/HTTP2.md
Outdated
| @@ -63,6 +63,7 @@ the necessary TLS features. Right now we support: | |||
| - mbedTLS: ALPN | |||
| - SChannel: ALPN | |||
| - wolfSSL: ALPN | |||
| - Secure Transport: ALPN | |||
There was a problem hiding this comment.
Let's add additional spaces to the above eight lines so they all line up.
|
Not sure if you caught it; I've re-pushed this with your comments addressed. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Rewrite of #500 using the public APIs introduced in macOS 10.13 and iOS 11.