diff --git a/ktor-client/ktor-client-curl/desktop/interop/include/curl/curl.h b/ktor-client/ktor-client-curl/desktop/interop/include/curl/curl.h index c4fae4d4463..18835586a1e 100644 --- a/ktor-client/ktor-client-curl/desktop/interop/include/curl/curl.h +++ b/ktor-client/ktor-client-curl/desktop/interop/include/curl/curl.h @@ -30,14 +30,15 @@ */ #ifdef CURL_NO_OLDIES -#define CURL_STRICTER +#define CURL_STRICTER /* not used since 8.11.0 */ #endif /* Compile-time deprecation macros. */ -#if (defined(__GNUC__) && \ - ((__GNUC__ > 12) || ((__GNUC__ == 12) && (__GNUC_MINOR__ >= 1 ))) || \ - defined(__IAR_SYSTEMS_ICC__)) && \ - !defined(__INTEL_COMPILER) && \ +#if (defined(__GNUC__) && \ + ((__GNUC__ > 12) || ((__GNUC__ == 12) && (__GNUC_MINOR__ >= 1))) || \ + (defined(__clang__) && __clang_major__ >= 3) || \ + defined(__IAR_SYSTEMS_ICC__)) && \ + !defined(__INTEL_COMPILER) && \ !defined(CURL_DISABLE_DEPRECATION) && !defined(BUILDING_LIBCURL) #define CURL_DEPRECATED(version, message) \ __attribute__((deprecated("since " # version ". " message))) @@ -113,13 +114,8 @@ extern "C" { #endif -#if defined(BUILDING_LIBCURL) || defined(CURL_STRICTER) -typedef struct Curl_easy CURL; -typedef struct Curl_share CURLSH; -#else typedef void CURL; typedef void CURLSH; -#endif /* * libcurl external API function linkage decorations. @@ -253,12 +249,12 @@ typedef int (*curl_xferinfo_callback)(void *clientp, #endif #ifndef CURL_MAX_WRITE_SIZE - /* Tests have proven that 20K is a very bad buffer size for uploads on - Windows, while 16K for some odd reason performed a lot better. - We do the ifndef check to allow this value to easier be changed at build - time for those who feel adventurous. The practical minimum is about - 400 bytes since libcurl uses a buffer of this size as a scratch area - (unrelated to network send operations). */ + /* Tests have proven that 20K is a bad buffer size for uploads on Windows, + while 16K for some odd reason performed a lot better. We do the ifndef + check to allow this value to easier be changed at build time for those + who feel adventurous. The practical minimum is about 400 bytes since + libcurl uses a buffer of this size as a scratch area (unrelated to + network send operations). */ #define CURL_MAX_WRITE_SIZE 16384 #endif @@ -555,14 +551,14 @@ typedef enum { CURLE_FTP_COULDNT_USE_REST, /* 31 - the REST command failed */ CURLE_OBSOLETE32, /* 32 - NOT USED */ CURLE_RANGE_ERROR, /* 33 - RANGE "command" did not work */ - CURLE_HTTP_POST_ERROR, /* 34 */ + CURLE_OBSOLETE34, /* 34 */ CURLE_SSL_CONNECT_ERROR, /* 35 - wrong when connecting with SSL */ CURLE_BAD_DOWNLOAD_RESUME, /* 36 - could not resume download */ CURLE_FILE_COULDNT_READ_FILE, /* 37 */ CURLE_LDAP_CANNOT_BIND, /* 38 */ CURLE_LDAP_SEARCH_FAILED, /* 39 */ CURLE_OBSOLETE40, /* 40 - NOT USED */ - CURLE_FUNCTION_NOT_FOUND, /* 41 - NOT USED starting with 7.53.0 */ + CURLE_OBSOLETE41, /* 41 - NOT USED starting with 7.53.0 */ CURLE_ABORTED_BY_CALLBACK, /* 42 */ CURLE_BAD_FUNCTION_ARGUMENT, /* 43 */ CURLE_OBSOLETE44, /* 44 - NOT USED */ @@ -647,6 +643,12 @@ typedef enum { #ifndef CURL_NO_OLDIES /* define this to test if your app builds with all the obsolete stuff removed! */ +/* removed in 7.53.0 */ +#define CURLE_FUNCTION_NOT_FOUND CURLE_OBSOLETE41 + +/* removed in 7.56.0 */ +#define CURLE_HTTP_POST_ERROR CURLE_OBSOLETE34 + /* Previously obsolete error code reused in 7.38.0 */ #define CURLE_OBSOLETE16 CURLE_HTTP2 @@ -942,6 +944,9 @@ typedef enum { a client certificate for authentication. (Schannel) */ #define CURLSSLOPT_AUTO_CLIENT_CERT (1<<5) +/* If possible, send data using TLS 1.3 early data */ +#define CURLSSLOPT_EARLYDATA (1<<6) + /* The default connection attempt delay in milliseconds for happy eyeballs. CURLOPT_HAPPY_EYEBALLS_TIMEOUT_MS.3 and happy-eyeballs-timeout-ms.d document this value, keep them in sync. */ @@ -2953,7 +2958,8 @@ typedef enum { CURLINFO_QUEUE_TIME_T = CURLINFO_OFF_T + 65, CURLINFO_USED_PROXY = CURLINFO_LONG + 66, CURLINFO_POSTTRANSFER_TIME_T = CURLINFO_OFF_T + 67, - CURLINFO_LASTONE = 67 + CURLINFO_EARLYDATA_SENT_T = CURLINFO_OFF_T + 68, + CURLINFO_LASTONE = 68 } CURLINFO; /* CURLINFO_RESPONSE_CODE is the new name for the option previously known as diff --git a/ktor-client/ktor-client-curl/desktop/interop/include/curl/curlver.h b/ktor-client/ktor-client-curl/desktop/interop/include/curl/curlver.h index 45ecdcef748..3da578d15d9 100644 --- a/ktor-client/ktor-client-curl/desktop/interop/include/curl/curlver.h +++ b/ktor-client/ktor-client-curl/desktop/interop/include/curl/curlver.h @@ -32,12 +32,12 @@ /* This is the version number of the libcurl package from which this header file origins: */ -#define LIBCURL_VERSION "8.10.1" +#define LIBCURL_VERSION "8.11.1" /* The numeric version number is also available "in parts" by using these defines: */ #define LIBCURL_VERSION_MAJOR 8 -#define LIBCURL_VERSION_MINOR 10 +#define LIBCURL_VERSION_MINOR 11 #define LIBCURL_VERSION_PATCH 1 /* This is the numeric version of the libcurl version number, meant for easier @@ -59,7 +59,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 0x080a01 +#define LIBCURL_VERSION_NUM 0x080b01 /* * This is the date and time when the full source package was created. The @@ -70,7 +70,7 @@ * * "2007-11-23" */ -#define LIBCURL_TIMESTAMP "2024-09-18" +#define LIBCURL_TIMESTAMP "2024-12-11" #define CURL_VERSION_BITS(x,y,z) ((x)<<16|(y)<<8|(z)) #define CURL_AT_LEAST_VERSION(x,y,z) \ diff --git a/ktor-client/ktor-client-curl/desktop/interop/include/curl/multi.h b/ktor-client/ktor-client-curl/desktop/interop/include/curl/multi.h index 7b6c351ada7..42469bb5657 100644 --- a/ktor-client/ktor-client-curl/desktop/interop/include/curl/multi.h +++ b/ktor-client/ktor-client-curl/desktop/interop/include/curl/multi.h @@ -54,11 +54,7 @@ extern "C" { #endif -#if defined(BUILDING_LIBCURL) || defined(CURL_STRICTER) -typedef struct Curl_multi CURLM; -#else typedef void CURLM; -#endif typedef enum { CURLM_CALL_MULTI_PERFORM = -1, /* please call curl_multi_perform() or @@ -248,13 +244,13 @@ CURL_EXTERN CURLMcode curl_multi_cleanup(CURLM *multi_handle); * The data the returned pointer points to will not survive calling * curl_multi_cleanup(). * - * The 'CURLMsg' struct is meant to be very simple and only contain - * very basic information. If more involved information is wanted, - * we will provide the particular "transfer handle" in that struct - * and that should/could/would be used in subsequent - * curl_easy_getinfo() calls (or similar). The point being that we - * must never expose complex structs to applications, as then we will - * undoubtably get backwards compatibility problems in the future. + * The 'CURLMsg' struct is meant to be simple and only contain basic + * information. If more involved information is wanted, we will + * provide the particular "transfer handle" in that struct and that + * should/could/would be used in subsequent curl_easy_getinfo() calls + * (or similar). The point being that we must never expose complex + * structs to applications, as then we will undoubtably get backwards + * compatibility problems in the future. * * Returns: A pointer to a filled-in struct, or NULL if it failed or ran out * of structs. It also writes the number of messages left in the diff --git a/ktor-client/ktor-client-curl/desktop/interop/lib/linuxArm64/libcrypto.a b/ktor-client/ktor-client-curl/desktop/interop/lib/linuxArm64/libcrypto.a index 3d3f47ded49..6efdb682f93 100644 Binary files a/ktor-client/ktor-client-curl/desktop/interop/lib/linuxArm64/libcrypto.a and b/ktor-client/ktor-client-curl/desktop/interop/lib/linuxArm64/libcrypto.a differ diff --git a/ktor-client/ktor-client-curl/desktop/interop/lib/linuxArm64/libcurl.a b/ktor-client/ktor-client-curl/desktop/interop/lib/linuxArm64/libcurl.a index ef11e71f941..b22ab657525 100644 Binary files a/ktor-client/ktor-client-curl/desktop/interop/lib/linuxArm64/libcurl.a and b/ktor-client/ktor-client-curl/desktop/interop/lib/linuxArm64/libcurl.a differ diff --git a/ktor-client/ktor-client-curl/desktop/interop/lib/linuxX64/libcrypto.a b/ktor-client/ktor-client-curl/desktop/interop/lib/linuxX64/libcrypto.a index 6497aad88e9..01f147673ae 100644 Binary files a/ktor-client/ktor-client-curl/desktop/interop/lib/linuxX64/libcrypto.a and b/ktor-client/ktor-client-curl/desktop/interop/lib/linuxX64/libcrypto.a differ diff --git a/ktor-client/ktor-client-curl/desktop/interop/lib/linuxX64/libcurl.a b/ktor-client/ktor-client-curl/desktop/interop/lib/linuxX64/libcurl.a index e8fddf9caa6..fe58e3771d5 100644 Binary files a/ktor-client/ktor-client-curl/desktop/interop/lib/linuxX64/libcurl.a and b/ktor-client/ktor-client-curl/desktop/interop/lib/linuxX64/libcurl.a differ diff --git a/ktor-client/ktor-client-curl/desktop/interop/lib/macosArm64/libcurl.a b/ktor-client/ktor-client-curl/desktop/interop/lib/macosArm64/libcurl.a index 87c62edd03f..289c29dce1e 100644 Binary files a/ktor-client/ktor-client-curl/desktop/interop/lib/macosArm64/libcurl.a and b/ktor-client/ktor-client-curl/desktop/interop/lib/macosArm64/libcurl.a differ diff --git a/ktor-client/ktor-client-curl/desktop/interop/lib/macosX64/libcurl.a b/ktor-client/ktor-client-curl/desktop/interop/lib/macosX64/libcurl.a index 15296500ffd..042a87a222d 100644 Binary files a/ktor-client/ktor-client-curl/desktop/interop/lib/macosX64/libcurl.a and b/ktor-client/ktor-client-curl/desktop/interop/lib/macosX64/libcurl.a differ diff --git a/ktor-client/ktor-client-curl/desktop/interop/lib/mingwX64/libcrypto.a b/ktor-client/ktor-client-curl/desktop/interop/lib/mingwX64/libcrypto.a index 4e07f76eefd..2397166a262 100644 Binary files a/ktor-client/ktor-client-curl/desktop/interop/lib/mingwX64/libcrypto.a and b/ktor-client/ktor-client-curl/desktop/interop/lib/mingwX64/libcrypto.a differ diff --git a/ktor-client/ktor-client-curl/desktop/interop/lib/mingwX64/libcurl.a b/ktor-client/ktor-client-curl/desktop/interop/lib/mingwX64/libcurl.a index 0789c09fa60..fa1bb78de40 100644 Binary files a/ktor-client/ktor-client-curl/desktop/interop/lib/mingwX64/libcurl.a and b/ktor-client/ktor-client-curl/desktop/interop/lib/mingwX64/libcurl.a differ diff --git a/ktor-client/ktor-client-curl/desktop/interop/lib/mingwX64/libssl.a b/ktor-client/ktor-client-curl/desktop/interop/lib/mingwX64/libssl.a index 0f0d686caba..fd2c9dc5913 100644 Binary files a/ktor-client/ktor-client-curl/desktop/interop/lib/mingwX64/libssl.a and b/ktor-client/ktor-client-curl/desktop/interop/lib/mingwX64/libssl.a differ diff --git a/ktor-client/ktor-client-curl/desktop/interop/lib/mingwX64/libz.a b/ktor-client/ktor-client-curl/desktop/interop/lib/mingwX64/libz.a index 779cbd23558..8f7560d2d9e 100644 Binary files a/ktor-client/ktor-client-curl/desktop/interop/lib/mingwX64/libz.a and b/ktor-client/ktor-client-curl/desktop/interop/lib/mingwX64/libz.a differ