35 lines
1.3 KiB
Diff
35 lines
1.3 KiB
Diff
Bug: 123971
|
|
Subject: depends
|
|
Tags: common
|
|
--- /CMakeLists.txt 2020-04-27 18:42:27.000000000 +0300
|
|
+++ /CMakeLists.txt 2020-05-29 13:09:08.292329827 +0300
|
|
@@ -1253,7 +1253,7 @@
|
|
set(_items)
|
|
_add_if("SSL" SSL_ENABLED)
|
|
_add_if("IPv6" ENABLE_IPV6)
|
|
-_add_if("unix-sockets" USE_UNIX_SOCKETS)
|
|
+_add_if("unixsockets" USE_UNIX_SOCKETS)
|
|
_add_if("libz" HAVE_LIBZ)
|
|
_add_if("AsynchDNS" USE_ARES OR USE_THREADS_POSIX OR USE_THREADS_WIN32)
|
|
_add_if("IDN" HAVE_LIBIDN2)
|
|
@@ -1319,7 +1319,7 @@
|
|
# Clear list and collect SSL backends
|
|
set(_items)
|
|
_add_if("WinSSL" SSL_ENABLED AND USE_WINDOWS_SSPI)
|
|
-_add_if("OpenSSL" SSL_ENABLED AND USE_OPENSSL)
|
|
+_add_if("SSL" SSL_ENABLED AND USE_OPENSSL)
|
|
_add_if("Secure Transport" SSL_ENABLED AND USE_SECTRANSP)
|
|
_add_if("mbedTLS" SSL_ENABLED AND USE_MBEDTLS)
|
|
_add_if("BearSSL" SSL_ENABLED AND USE_BEARSSL)
|
|
--- /tests/libtest/test1013.pl 2020-04-27 18:42:27.000000000 +0300
|
|
+++ /tests/libtest/test1013.pl 2020-05-29 13:15:18.364232120 +0300
|
|
@@ -44,7 +44,7 @@
|
|
@curl = split / /,$1;
|
|
|
|
# These features are not supported by curl-config
|
|
-@curl = grep(!/^(Debug|TrackMemory|Metalink|Largefile|CharConv)$/i, @curl);
|
|
+@curl = grep(!/^(Debug|TrackMemory|Metalink|Largefile|CharConv|HTTPS-proxy)$/i, @curl);
|
|
@curl = sort @curl;
|
|
|
|
# Read the output of curl-config
|