73 lines
2.7 KiB
Diff
73 lines
2.7 KiB
Diff
diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt
|
|
index 9eef01aaf0..d141d4086c 100644
|
|
--- a/Utilities/cmcurl/CMakeLists.txt
|
|
+++ b/Utilities/cmcurl/CMakeLists.txt
|
|
@@ -537,12 +537,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
|
message(FATAL_ERROR "CoreFoundation framework not found")
|
|
endif()
|
|
|
|
- find_library(SYSTEMCONFIGURATION_FRAMEWORK "SystemConfiguration")
|
|
- if(NOT SYSTEMCONFIGURATION_FRAMEWORK)
|
|
- message(FATAL_ERROR "SystemConfiguration framework not found")
|
|
- endif()
|
|
-
|
|
- list(APPEND CURL_LIBS "-framework CoreFoundation" "-framework SystemConfiguration")
|
|
+ list(APPEND CURL_LIBS "-framework CoreFoundation")
|
|
|
|
if(CMAKE_USE_SECTRANSP)
|
|
find_library(SECURITY_FRAMEWORK "Security")
|
|
diff --git a/Utilities/cmcurl/lib/curl_setup.h b/Utilities/cmcurl/lib/curl_setup.h
|
|
index 554dcc1e67..059f14e632 100644
|
|
--- a/Utilities/cmcurl/lib/curl_setup.h
|
|
+++ b/Utilities/cmcurl/lib/curl_setup.h
|
|
@@ -257,11 +257,7 @@
|
|
* performing this task will result in a synthesized IPv6 address.
|
|
*/
|
|
#if defined(__APPLE__) && !defined(USE_ARES)
|
|
-#include <TargetConditionals.h>
|
|
#define USE_RESOLVE_ON_IPS 1
|
|
-# if defined(TARGET_OS_OSX) && TARGET_OS_OSX
|
|
-# define CURL_OSX_CALL_COPYPROXIES 1
|
|
-# endif
|
|
#endif
|
|
|
|
#ifdef USE_LWIPSOCK
|
|
diff --git a/Utilities/cmcurl/lib/hostip.c b/Utilities/cmcurl/lib/hostip.c
|
|
index 117caa2957..9f7c709e44 100644
|
|
--- a/Utilities/cmcurl/lib/hostip.c
|
|
+++ b/Utilities/cmcurl/lib/hostip.c
|
|
@@ -68,10 +68,6 @@
|
|
#include "curl_memory.h"
|
|
#include "memdebug.h"
|
|
|
|
-#if defined(ENABLE_IPV6) && defined(CURL_OSX_CALL_COPYPROXIES)
|
|
-#include <SystemConfiguration/SCDynamicStoreCopySpecific.h>
|
|
-#endif
|
|
-
|
|
#if defined(CURLRES_SYNCH) && \
|
|
defined(HAVE_ALARM) && defined(SIGALRM) && defined(HAVE_SIGSETJMP)
|
|
/* alarm-based timeouts can only be used with all the dependencies satisfied */
|
|
@@ -653,23 +649,6 @@ enum resolve_t Curl_resolv(struct Curl_easy *data,
|
|
return CURLRESOLV_ERROR;
|
|
}
|
|
|
|
-#if defined(ENABLE_IPV6) && defined(CURL_OSX_CALL_COPYPROXIES)
|
|
- {
|
|
- /*
|
|
- * 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 a macOS and is not needed for
|
|
- * IPv4-only builds, hence the conditions above.
|
|
- */
|
|
- CFDictionaryRef dict = SCDynamicStoreCopyProxies(NULL);
|
|
- if(dict)
|
|
- CFRelease(dict);
|
|
- }
|
|
-#endif
|
|
-
|
|
#ifndef USE_RESOLVE_ON_IPS
|
|
/* First check if this is an IPv4 address string */
|
|
if(Curl_inet_pton(AF_INET, hostname, &in) > 0)
|