mirror of
https://github.com/curl/curl.git
synced 2024-11-27 05:50:21 +08:00
8b7cbe9dec
Now SCDynamicStoreCopyProxies is called (and the required frameworks are
linked in) on all versions of macOS and only on macOS. Fixes crash due
to undefined symbol when built with the macOS 10.11 SDK or earlier.
CURL_OSX_CALL_COPYPROXIES is renamed to CURL_MACOS_CALL_COPYPROXIES and
is now only defined when SCDynamicStoreCopyProxies will actually be
called. Previously, it was defined when ENABLE_IPV6 was not defined but
SCDynamicStoreCopyProxies is not called in that case.
TARGET_OS_OSX is only defined in the macOS 10.12 SDK and later and only
when dynamic targets are enabled. TARGET_OS_MAC is always defined but
means any Mac OS or derivative including macOS, iOS, tvOS, and watchOS.
TARGET_OS_IPHONE means any Darwin OS other than macOS.
Follow-up to c73b2f82
Fixes #11502
Closes #11516
56 lines
1.8 KiB
C
56 lines
1.8 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
*
|
|
* This software is licensed as described in the file COPYING, which
|
|
* you should have received as part of this distribution. The terms
|
|
* are also available at https://curl.se/docs/copyright.html.
|
|
*
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
* SPDX-License-Identifier: curl
|
|
*
|
|
***************************************************************************/
|
|
|
|
#include "curl_setup.h"
|
|
|
|
#ifdef CURL_MACOS_CALL_COPYPROXIES
|
|
|
|
#include <curl/curl.h>
|
|
|
|
#include "macos.h"
|
|
|
|
#include <SystemConfiguration/SCDynamicStoreCopySpecific.h>
|
|
|
|
CURLcode Curl_macos_init(void)
|
|
{
|
|
{
|
|
/*
|
|
* The automagic conversion from IPv4 literals to IPv6 literals only
|
|
* works if the SCDynamicStoreCopyProxies system function gets called
|
|
* first. As Curl currently doesn't support system-wide HTTP proxies, we
|
|
* therefore don't use any value this function might return.
|
|
*
|
|
* This function is only available on macOS and is not needed for
|
|
* IPv4-only builds, hence the conditions for defining
|
|
* CURL_MACOS_CALL_COPYPROXIES in curl_setup.h.
|
|
*/
|
|
CFDictionaryRef dict = SCDynamicStoreCopyProxies(NULL);
|
|
if(dict)
|
|
CFRelease(dict);
|
|
}
|
|
return CURLE_OK;
|
|
}
|
|
|
|
#endif
|