mirror of
https://github.com/curl/curl.git
synced 2024-12-21 06:50:10 +08:00
sectransp: tvOS 11 is required for ALPN support
Reported-by: nianxuejie on github Assisted-by: Nick Zitzmann Assisted-by: Jay Satiro Fixes #3689 Closes #3690
This commit is contained in:
parent
dc5edf9124
commit
7550f62d07
@ -1577,7 +1577,7 @@ static CURLcode sectransp_connect_step1(struct connectdata *conn,
|
|||||||
|
|
||||||
#if (CURL_BUILD_MAC_10_13 || CURL_BUILD_IOS_11) && HAVE_BUILTIN_AVAILABLE == 1
|
#if (CURL_BUILD_MAC_10_13 || CURL_BUILD_IOS_11) && HAVE_BUILTIN_AVAILABLE == 1
|
||||||
if(conn->bits.tls_enable_alpn) {
|
if(conn->bits.tls_enable_alpn) {
|
||||||
if(__builtin_available(macOS 10.13.4, iOS 11, *)) {
|
if(__builtin_available(macOS 10.13.4, iOS 11, tvOS 11, *)) {
|
||||||
CFMutableArrayRef alpnArr = CFArrayCreateMutable(NULL, 0,
|
CFMutableArrayRef alpnArr = CFArrayCreateMutable(NULL, 0,
|
||||||
&kCFTypeArrayCallBacks);
|
&kCFTypeArrayCallBacks);
|
||||||
|
|
||||||
@ -2628,7 +2628,7 @@ sectransp_connect_step2(struct connectdata *conn, int sockindex)
|
|||||||
|
|
||||||
#if(CURL_BUILD_MAC_10_13 || CURL_BUILD_IOS_11) && HAVE_BUILTIN_AVAILABLE == 1
|
#if(CURL_BUILD_MAC_10_13 || CURL_BUILD_IOS_11) && HAVE_BUILTIN_AVAILABLE == 1
|
||||||
if(conn->bits.tls_enable_alpn) {
|
if(conn->bits.tls_enable_alpn) {
|
||||||
if(__builtin_available(macOS 10.13.4, iOS 11, *)) {
|
if(__builtin_available(macOS 10.13.4, iOS 11, tvOS 11, *)) {
|
||||||
CFArrayRef alpnArr = NULL;
|
CFArrayRef alpnArr = NULL;
|
||||||
CFStringRef chosenProtocol = NULL;
|
CFStringRef chosenProtocol = NULL;
|
||||||
err = SSLCopyALPNProtocols(BACKEND->ssl_ctx, &alpnArr);
|
err = SSLCopyALPNProtocols(BACKEND->ssl_ctx, &alpnArr);
|
||||||
|
Loading…
Reference in New Issue
Block a user