libcurl: update to 8.11.0

3 files changed, 29 insertions, 33 deletions

diff --git a/libs/libcurl/include/curl/curl.h b/libs/libcurl/include/curl/curl.h
index 9fc97f0d7f..e4a4d972c6 100644
--- a/libs/libcurl/include/curl/curl.h
+++ b/libs/libcurl/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

 

@@ -942,6 +938,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 +2952,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/libs/libcurl/include/curl/curlver.h b/libs/libcurl/include/curl/curlver.h
index 68e26068a4..7efc6c21b9 100644
--- a/libs/libcurl/include/curl/curlver.h
+++ b/libs/libcurl/include/curl/curlver.h
@@ -32,13 +32,13 @@
 

 /* 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.0"

 

 /* 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_PATCH 1

+#define LIBCURL_VERSION_MINOR 11

+#define LIBCURL_VERSION_PATCH 0

 

 /* This is the numeric version of the libcurl version number, meant for easier

    parsing and comparisons by programs. The LIBCURL_VERSION_NUM define will

@@ -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 0x080b00

 

 /*

  * 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-11-06"

 

 #define CURL_VERSION_BITS(x,y,z) ((x)<<16|(y)<<8|(z))

 #define CURL_AT_LEAST_VERSION(x,y,z) \

diff --git a/libs/libcurl/include/curl/multi.h b/libs/libcurl/include/curl/multi.h
index 0041c9158a..d0bb26a382 100644
--- a/libs/libcurl/include/curl/multi.h
+++ b/libs/libcurl/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