diff options
| author | Pavol Markovic <pavol.markovic@serato.com> | 2017-11-15 15:35:14 +1300 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2017-11-15 11:10:51 +0100 |
| commit | 6ce98456774792ee5fd798f18660d98facede739 (patch) | |
| tree | d7c0d485b3cc3a5415faa10c0f157366842a51b8 | |
| parent | d3ab7c5a21ebfa0e3ceb3a395f23aceb5ddc58b6 (diff) | |
| download | curl-6ce98456774792ee5fd798f18660d98facede739.tar.gz | |
macOS: Fix missing connectx function with Xcode version older than 9.0
The previous fix https://github.com/curl/curl/pull/1788 worked just for
Xcode 9. This commit extends the fix to older Xcode versions effectively
by not using connectx function.
Fixes https://github.com/curl/curl/issues/1330
Fixes https://github.com/curl/curl/issues/2080
Closes https://github.com/curl/curl/pull/1336
Closes #2082
| -rw-r--r-- | lib/connect.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/lib/connect.c b/lib/connect.c index d47c1b996..16104bc4f 100644 --- a/lib/connect.c +++ b/lib/connect.c @@ -1065,10 +1065,12 @@ static CURLcode singleipconnect(struct connectdata *conn, /* Connect TCP sockets, bind UDP */ if(!isconnected && (conn->socktype == SOCK_STREAM)) { if(conn->bits.tcp_fastopen) { -#if defined(CONNECT_DATA_IDEMPOTENT) /* OS X */ -#ifdef HAVE_BUILTIN_AVAILABLE +#if defined(CONNECT_DATA_IDEMPOTENT) /* Darwin */ +# if defined(HAVE_BUILTIN_AVAILABLE) + /* while connectx function is available since macOS 10.11 / iOS 9, + it did not have the interface declared correctly until + Xcode 9 / macOS SDK 10.13 */ if(__builtin_available(macOS 10.11, iOS 9.0, tvOS 9.0, watchOS 2.0, *)) { -#endif /* HAVE_BUILTIN_AVAILABLE */ sa_endpoints_t endpoints; endpoints.sae_srcif = 0; endpoints.sae_srcaddr = NULL; @@ -1079,12 +1081,13 @@ static CURLcode singleipconnect(struct connectdata *conn, rc = connectx(sockfd, &endpoints, SAE_ASSOCID_ANY, CONNECT_RESUME_ON_READ_WRITE | CONNECT_DATA_IDEMPOTENT, NULL, 0, NULL, NULL); -#ifdef HAVE_BUILTIN_AVAILABLE } else { rc = connect(sockfd, &addr.sa_addr, addr.addrlen); } -#endif /* HAVE_BUILTIN_AVAILABLE */ +# else + rc = connect(sockfd, &addr.sa_addr, addr.addrlen); +# endif /* HAVE_BUILTIN_AVAILABLE */ #elif defined(MSG_FASTOPEN) /* Linux */ if(conn->given->flags & PROTOPT_SSL) rc = connect(sockfd, &addr.sa_addr, addr.addrlen); |