diff --git a/thirdparty/README.md b/thirdparty/README.md index 24033e303c..260b4caaeb 100644 --- a/thirdparty/README.md +++ b/thirdparty/README.md @@ -46,7 +46,7 @@ ## curl - Upstream: https://github.com/curl/curl -- Version: 7.80.0 +- Version: 7.81.0 - License: Curl (MIT/X) ## flatbuffers diff --git a/thirdparty/curl/include/curl/curl.h b/thirdparty/curl/include/curl/curl.h index 6b6ac8a05e..7b69ce2d67 100644 --- a/thirdparty/curl/include/curl/curl.h +++ b/thirdparty/curl/include/curl/curl.h @@ -2132,6 +2132,9 @@ typedef enum { * (in seconds) */ CURLOPT(CURLOPT_MAXLIFETIME_CONN, CURLOPTTYPE_LONG, 314), + /* Set MIME option flags. */ + CURLOPT(CURLOPT_MIME_OPTIONS, CURLOPTTYPE_LONG, 315), + CURLOPT_LASTENTRY /* the last unused */ } CURLoption; @@ -2291,6 +2294,9 @@ CURL_EXTERN int curl_strnequal(const char *s1, const char *s2, size_t n); typedef struct curl_mime curl_mime; /* Mime context. */ typedef struct curl_mimepart curl_mimepart; /* Mime part context. */ +/* CURLMIMEOPT_ defines are for the CURLOPT_MIME_OPTIONS option. */ +#define CURLMIMEOPT_FORMESCAPE (1<<0) /* Use backslash-escaping for forms. */ + /* * NAME curl_mime_init() * diff --git a/thirdparty/curl/include/curl/curlver.h b/thirdparty/curl/include/curl/curlver.h index 6756c31bff..6d2f99b6da 100644 --- a/thirdparty/curl/include/curl/curlver.h +++ b/thirdparty/curl/include/curl/curlver.h @@ -30,12 +30,12 @@ /* This is the version number of the libcurl package from which this header file origins: */ -#define LIBCURL_VERSION "7.80.0" +#define LIBCURL_VERSION "7.81.0" /* The numeric version number is also available "in parts" by using these defines: */ #define LIBCURL_VERSION_MAJOR 7 -#define LIBCURL_VERSION_MINOR 80 +#define LIBCURL_VERSION_MINOR 81 #define LIBCURL_VERSION_PATCH 0 /* This is the numeric version of the libcurl version number, meant for easier @@ -57,7 +57,7 @@ CURL_VERSION_BITS() macro since curl's own configure script greps for it and needs it to contain the full number. */ -#define LIBCURL_VERSION_NUM 0x075000 +#define LIBCURL_VERSION_NUM 0x075100 /* * This is the date and time when the full source package was created. The @@ -68,7 +68,7 @@ * * "2007-11-23" */ -#define LIBCURL_TIMESTAMP "2021-11-10" +#define LIBCURL_TIMESTAMP "2022-01-05" #define CURL_VERSION_BITS(x,y,z) ((x)<<16|(y)<<8|(z)) #define CURL_AT_LEAST_VERSION(x,y,z) \ diff --git a/thirdparty/curl/include/curl/multi.h b/thirdparty/curl/include/curl/multi.h index 37f9829b3b..91cd95d323 100644 --- a/thirdparty/curl/include/curl/multi.h +++ b/thirdparty/curl/include/curl/multi.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2021, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -73,7 +73,8 @@ typedef enum { CURLM_RECURSIVE_API_CALL, /* an api function was called from inside a callback */ CURLM_WAKEUP_FAILURE, /* wakeup is unavailable or failed */ - CURLM_BAD_FUNCTION_ARGUMENT, /* function called with a bad parameter */ + CURLM_BAD_FUNCTION_ARGUMENT, /* function called with a bad parameter */ + CURLM_ABORTED_BY_CALLBACK, CURLM_LAST } CURLMcode; diff --git a/thirdparty/curl/include/curl/urlapi.h b/thirdparty/curl/include/curl/urlapi.h index 3c4b4e18aa..a475f91b60 100644 --- a/thirdparty/curl/include/curl/urlapi.h +++ b/thirdparty/curl/include/curl/urlapi.h @@ -48,6 +48,18 @@ typedef enum { CURLUE_NO_PORT, /* 15 */ CURLUE_NO_QUERY, /* 16 */ CURLUE_NO_FRAGMENT, /* 17 */ + CURLUE_NO_ZONEID, /* 18 */ + CURLUE_BAD_FILE_URL, /* 19 */ + CURLUE_BAD_FRAGMENT, /* 20 */ + CURLUE_BAD_HOSTNAME, /* 21 */ + CURLUE_BAD_IPV6, /* 22 */ + CURLUE_BAD_LOGIN, /* 23 */ + CURLUE_BAD_PASSWORD, /* 24 */ + CURLUE_BAD_PATH, /* 25 */ + CURLUE_BAD_QUERY, /* 26 */ + CURLUE_BAD_SCHEME, /* 27 */ + CURLUE_BAD_SLASHES, /* 28 */ + CURLUE_BAD_USER, /* 29 */ CURLUE_LAST } CURLUcode; diff --git a/thirdparty/curl/prebuilt/android/arm64-v8a/libcurl.a b/thirdparty/curl/prebuilt/android/arm64-v8a/libcurl.a index eee932bdd0..a1ee6b1bd0 100644 Binary files a/thirdparty/curl/prebuilt/android/arm64-v8a/libcurl.a and b/thirdparty/curl/prebuilt/android/arm64-v8a/libcurl.a differ diff --git a/thirdparty/curl/prebuilt/android/armeabi-v7a/libcurl.a b/thirdparty/curl/prebuilt/android/armeabi-v7a/libcurl.a index 77244365f2..28a3581f64 100644 Binary files a/thirdparty/curl/prebuilt/android/armeabi-v7a/libcurl.a and b/thirdparty/curl/prebuilt/android/armeabi-v7a/libcurl.a differ diff --git a/thirdparty/curl/prebuilt/android/x86/libcurl.a b/thirdparty/curl/prebuilt/android/x86/libcurl.a index 8e3324af33..fff75c3a6e 100644 Binary files a/thirdparty/curl/prebuilt/android/x86/libcurl.a and b/thirdparty/curl/prebuilt/android/x86/libcurl.a differ diff --git a/thirdparty/curl/prebuilt/ios/libcurl.a b/thirdparty/curl/prebuilt/ios/libcurl.a index e84a13b8e2..93fd5293c8 100644 Binary files a/thirdparty/curl/prebuilt/ios/libcurl.a and b/thirdparty/curl/prebuilt/ios/libcurl.a differ diff --git a/thirdparty/curl/prebuilt/linux/x64/libcurl.a b/thirdparty/curl/prebuilt/linux/x64/libcurl.a index 010c8319c7..d4955c2bb7 100644 Binary files a/thirdparty/curl/prebuilt/linux/x64/libcurl.a and b/thirdparty/curl/prebuilt/linux/x64/libcurl.a differ diff --git a/thirdparty/curl/prebuilt/mac/libcurl.a b/thirdparty/curl/prebuilt/mac/libcurl.a index 23c6be436b..a933cd3e4f 100644 Binary files a/thirdparty/curl/prebuilt/mac/libcurl.a and b/thirdparty/curl/prebuilt/mac/libcurl.a differ diff --git a/thirdparty/curl/prebuilt/windows/x64/libcurl.dll b/thirdparty/curl/prebuilt/windows/x64/libcurl.dll index 41d21d93cf..32cff68e0a 100644 Binary files a/thirdparty/curl/prebuilt/windows/x64/libcurl.dll and b/thirdparty/curl/prebuilt/windows/x64/libcurl.dll differ diff --git a/thirdparty/curl/prebuilt/windows/x86/libcurl.dll b/thirdparty/curl/prebuilt/windows/x86/libcurl.dll index c6a396b03f..be631a059a 100644 Binary files a/thirdparty/curl/prebuilt/windows/x86/libcurl.dll and b/thirdparty/curl/prebuilt/windows/x86/libcurl.dll differ diff --git a/thirdparty/openssl/include/android-arm/openssl/configuration.h b/thirdparty/openssl/include/android-arm/openssl/configuration.h index e329f44877..736ca286d0 100644 --- a/thirdparty/openssl/include/android-arm/openssl/configuration.h +++ b/thirdparty/openssl/include/android-arm/openssl/configuration.h @@ -45,6 +45,9 @@ extern "C" { # ifndef OPENSSL_NO_CAPIENG # define OPENSSL_NO_CAPIENG # endif +# ifndef OPENSSL_NO_COMP +# define OPENSSL_NO_COMP +# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif diff --git a/thirdparty/openssl/include/android-arm64/openssl/configuration.h b/thirdparty/openssl/include/android-arm64/openssl/configuration.h index 48e91cc374..b4edd53df3 100644 --- a/thirdparty/openssl/include/android-arm64/openssl/configuration.h +++ b/thirdparty/openssl/include/android-arm64/openssl/configuration.h @@ -45,6 +45,9 @@ extern "C" { # ifndef OPENSSL_NO_CAPIENG # define OPENSSL_NO_CAPIENG # endif +# ifndef OPENSSL_NO_COMP +# define OPENSSL_NO_COMP +# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif diff --git a/thirdparty/openssl/include/android-x86/openssl/configuration.h b/thirdparty/openssl/include/android-x86/openssl/configuration.h index 991dfb4f0f..712c9d8bed 100644 --- a/thirdparty/openssl/include/android-x86/openssl/configuration.h +++ b/thirdparty/openssl/include/android-x86/openssl/configuration.h @@ -45,6 +45,9 @@ extern "C" { # ifndef OPENSSL_NO_CAPIENG # define OPENSSL_NO_CAPIENG # endif +# ifndef OPENSSL_NO_COMP +# define OPENSSL_NO_COMP +# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif diff --git a/thirdparty/openssl/include/ios-arm/openssl/configuration.h b/thirdparty/openssl/include/ios-arm/openssl/configuration.h index ed64fcbe48..6012ea3671 100644 --- a/thirdparty/openssl/include/ios-arm/openssl/configuration.h +++ b/thirdparty/openssl/include/ios-arm/openssl/configuration.h @@ -48,6 +48,9 @@ extern "C" { # ifndef OPENSSL_NO_CAPIENG # define OPENSSL_NO_CAPIENG # endif +# ifndef OPENSSL_NO_COMP +# define OPENSSL_NO_COMP +# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif diff --git a/thirdparty/openssl/include/ios-arm64/openssl/configuration.h b/thirdparty/openssl/include/ios-arm64/openssl/configuration.h index f2c50eb356..6774fe826c 100644 --- a/thirdparty/openssl/include/ios-arm64/openssl/configuration.h +++ b/thirdparty/openssl/include/ios-arm64/openssl/configuration.h @@ -48,6 +48,9 @@ extern "C" { # ifndef OPENSSL_NO_CAPIENG # define OPENSSL_NO_CAPIENG # endif +# ifndef OPENSSL_NO_COMP +# define OPENSSL_NO_COMP +# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif diff --git a/thirdparty/openssl/include/ios-x64/openssl/configuration.h b/thirdparty/openssl/include/ios-x64/openssl/configuration.h index c882529594..046471633c 100644 --- a/thirdparty/openssl/include/ios-x64/openssl/configuration.h +++ b/thirdparty/openssl/include/ios-x64/openssl/configuration.h @@ -48,6 +48,9 @@ extern "C" { # ifndef OPENSSL_NO_CAPIENG # define OPENSSL_NO_CAPIENG # endif +# ifndef OPENSSL_NO_COMP +# define OPENSSL_NO_COMP +# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif diff --git a/thirdparty/openssl/include/linux/openssl/configuration.h b/thirdparty/openssl/include/linux/openssl/configuration.h index 37959b996c..859a170762 100644 --- a/thirdparty/openssl/include/linux/openssl/configuration.h +++ b/thirdparty/openssl/include/linux/openssl/configuration.h @@ -39,6 +39,9 @@ extern "C" { # ifndef OPENSSL_NO_ASYNC # define OPENSSL_NO_ASYNC # endif +# ifndef OPENSSL_NO_COMP +# define OPENSSL_NO_COMP +# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif diff --git a/thirdparty/openssl/include/mac/openssl/configuration.h b/thirdparty/openssl/include/mac/openssl/configuration.h index e28707baab..907e48f8bd 100644 --- a/thirdparty/openssl/include/mac/openssl/configuration.h +++ b/thirdparty/openssl/include/mac/openssl/configuration.h @@ -45,6 +45,9 @@ extern "C" { # ifndef OPENSSL_NO_ASYNC # define OPENSSL_NO_ASYNC # endif +# ifndef OPENSSL_NO_COMP +# define OPENSSL_NO_COMP +# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif diff --git a/thirdparty/openssl/include/win32/openssl/configuration.h b/thirdparty/openssl/include/win32/openssl/configuration.h index 44800afefa..d39ef38ab6 100644 --- a/thirdparty/openssl/include/win32/openssl/configuration.h +++ b/thirdparty/openssl/include/win32/openssl/configuration.h @@ -45,6 +45,9 @@ extern "C" { # ifndef OPENSSL_NO_ASAN # define OPENSSL_NO_ASAN # endif +# ifndef OPENSSL_NO_COMP +# define OPENSSL_NO_COMP +# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif diff --git a/thirdparty/openssl/include/win64/openssl/configuration.h b/thirdparty/openssl/include/win64/openssl/configuration.h index d9662edd9f..05880490b7 100644 --- a/thirdparty/openssl/include/win64/openssl/configuration.h +++ b/thirdparty/openssl/include/win64/openssl/configuration.h @@ -45,6 +45,9 @@ extern "C" { # ifndef OPENSSL_NO_ASAN # define OPENSSL_NO_ASAN # endif +# ifndef OPENSSL_NO_COMP +# define OPENSSL_NO_COMP +# endif # ifndef OPENSSL_NO_CRYPTO_MDEBUG # define OPENSSL_NO_CRYPTO_MDEBUG # endif diff --git a/thirdparty/openssl/prebuilt/android/arm64-v8a/libcrypto.a b/thirdparty/openssl/prebuilt/android/arm64-v8a/libcrypto.a index 3109d7c883..00098de7b2 100644 Binary files a/thirdparty/openssl/prebuilt/android/arm64-v8a/libcrypto.a and b/thirdparty/openssl/prebuilt/android/arm64-v8a/libcrypto.a differ diff --git a/thirdparty/openssl/prebuilt/android/arm64-v8a/libssl.a b/thirdparty/openssl/prebuilt/android/arm64-v8a/libssl.a index 165df68443..2a898a8da1 100644 Binary files a/thirdparty/openssl/prebuilt/android/arm64-v8a/libssl.a and b/thirdparty/openssl/prebuilt/android/arm64-v8a/libssl.a differ diff --git a/thirdparty/openssl/prebuilt/android/armeabi-v7a/libcrypto.a b/thirdparty/openssl/prebuilt/android/armeabi-v7a/libcrypto.a index 5ee50ba9ef..418148059f 100644 Binary files a/thirdparty/openssl/prebuilt/android/armeabi-v7a/libcrypto.a and b/thirdparty/openssl/prebuilt/android/armeabi-v7a/libcrypto.a differ diff --git a/thirdparty/openssl/prebuilt/android/armeabi-v7a/libssl.a b/thirdparty/openssl/prebuilt/android/armeabi-v7a/libssl.a index b502c2a307..281902e9dd 100644 Binary files a/thirdparty/openssl/prebuilt/android/armeabi-v7a/libssl.a and b/thirdparty/openssl/prebuilt/android/armeabi-v7a/libssl.a differ diff --git a/thirdparty/openssl/prebuilt/android/x86/libcrypto.a b/thirdparty/openssl/prebuilt/android/x86/libcrypto.a index 7d839e732e..97d0787062 100644 Binary files a/thirdparty/openssl/prebuilt/android/x86/libcrypto.a and b/thirdparty/openssl/prebuilt/android/x86/libcrypto.a differ diff --git a/thirdparty/openssl/prebuilt/android/x86/libssl.a b/thirdparty/openssl/prebuilt/android/x86/libssl.a index 51610cb8b0..9eb0b7f76f 100644 Binary files a/thirdparty/openssl/prebuilt/android/x86/libssl.a and b/thirdparty/openssl/prebuilt/android/x86/libssl.a differ diff --git a/thirdparty/openssl/prebuilt/ios/libcrypto.a b/thirdparty/openssl/prebuilt/ios/libcrypto.a index ddbafa6726..add1fac756 100644 Binary files a/thirdparty/openssl/prebuilt/ios/libcrypto.a and b/thirdparty/openssl/prebuilt/ios/libcrypto.a differ diff --git a/thirdparty/openssl/prebuilt/ios/libssl.a b/thirdparty/openssl/prebuilt/ios/libssl.a index 9faa47b1db..8c9d859521 100644 Binary files a/thirdparty/openssl/prebuilt/ios/libssl.a and b/thirdparty/openssl/prebuilt/ios/libssl.a differ diff --git a/thirdparty/openssl/prebuilt/linux/x64/libcrypto.a b/thirdparty/openssl/prebuilt/linux/x64/libcrypto.a index a7a92231ca..14b9fab10b 100644 Binary files a/thirdparty/openssl/prebuilt/linux/x64/libcrypto.a and b/thirdparty/openssl/prebuilt/linux/x64/libcrypto.a differ diff --git a/thirdparty/openssl/prebuilt/linux/x64/libssl.a b/thirdparty/openssl/prebuilt/linux/x64/libssl.a index 3033a30c65..fe18be9210 100644 Binary files a/thirdparty/openssl/prebuilt/linux/x64/libssl.a and b/thirdparty/openssl/prebuilt/linux/x64/libssl.a differ diff --git a/thirdparty/openssl/prebuilt/mac/libcrypto.a b/thirdparty/openssl/prebuilt/mac/libcrypto.a index eae818c211..49f42bd695 100644 Binary files a/thirdparty/openssl/prebuilt/mac/libcrypto.a and b/thirdparty/openssl/prebuilt/mac/libcrypto.a differ diff --git a/thirdparty/openssl/prebuilt/mac/libssl.a b/thirdparty/openssl/prebuilt/mac/libssl.a index e2cec4aa70..e7a01776d0 100644 Binary files a/thirdparty/openssl/prebuilt/mac/libssl.a and b/thirdparty/openssl/prebuilt/mac/libssl.a differ diff --git a/thirdparty/openssl/prebuilt/windows/x64/libcrypto-3-x64.dll b/thirdparty/openssl/prebuilt/windows/x64/libcrypto-3-x64.dll index 90d3332b49..ccce1fd72c 100644 Binary files a/thirdparty/openssl/prebuilt/windows/x64/libcrypto-3-x64.dll and b/thirdparty/openssl/prebuilt/windows/x64/libcrypto-3-x64.dll differ diff --git a/thirdparty/openssl/prebuilt/windows/x64/libcrypto.lib b/thirdparty/openssl/prebuilt/windows/x64/libcrypto.lib index c4d8de3994..5d53a778ac 100644 Binary files a/thirdparty/openssl/prebuilt/windows/x64/libcrypto.lib and b/thirdparty/openssl/prebuilt/windows/x64/libcrypto.lib differ diff --git a/thirdparty/openssl/prebuilt/windows/x64/libssl-3-x64.dll b/thirdparty/openssl/prebuilt/windows/x64/libssl-3-x64.dll index 8121dc94b7..dfe6710f66 100644 Binary files a/thirdparty/openssl/prebuilt/windows/x64/libssl-3-x64.dll and b/thirdparty/openssl/prebuilt/windows/x64/libssl-3-x64.dll differ diff --git a/thirdparty/openssl/prebuilt/windows/x86/libcrypto-3.dll b/thirdparty/openssl/prebuilt/windows/x86/libcrypto-3.dll index 8282f5fa7a..4eaadc59b1 100644 Binary files a/thirdparty/openssl/prebuilt/windows/x86/libcrypto-3.dll and b/thirdparty/openssl/prebuilt/windows/x86/libcrypto-3.dll differ diff --git a/thirdparty/openssl/prebuilt/windows/x86/libcrypto.lib b/thirdparty/openssl/prebuilt/windows/x86/libcrypto.lib index 435722b097..616f3128a9 100644 Binary files a/thirdparty/openssl/prebuilt/windows/x86/libcrypto.lib and b/thirdparty/openssl/prebuilt/windows/x86/libcrypto.lib differ diff --git a/thirdparty/openssl/prebuilt/windows/x86/libssl-3.dll b/thirdparty/openssl/prebuilt/windows/x86/libssl-3.dll index 4982ea8a5b..5546767746 100644 Binary files a/thirdparty/openssl/prebuilt/windows/x86/libssl-3.dll and b/thirdparty/openssl/prebuilt/windows/x86/libssl-3.dll differ