libcurl: update to 8.12.1

4 files changed, 94 insertions, 104 deletions

diff --git a/libs/libcurl/include/curl/curl.h b/libs/libcurl/include/curl/curl.h
index 2b495fff6d..2e88c867fd 100644
--- a/libs/libcurl/include/curl/curl.h
+++ b/libs/libcurl/include/curl/curl.h
@@ -1959,10 +1959,10 @@ typedef enum {
   /* Set stream weight, 1 - 256 (default is 16) */

   CURLOPT(CURLOPT_STREAM_WEIGHT, CURLOPTTYPE_LONG, 239),

 

-  /* Set stream dependency on another CURL handle */

+  /* Set stream dependency on another curl handle */

   CURLOPT(CURLOPT_STREAM_DEPENDS, CURLOPTTYPE_OBJECTPOINT, 240),

 

-  /* Set E-xclusive stream dependency on another CURL handle */

+  /* Set E-xclusive stream dependency on another curl handle */

   CURLOPT(CURLOPT_STREAM_DEPENDS_E, CURLOPTTYPE_OBJECTPOINT, 241),

 

   /* Do not send any tftp option requests to the server */

@@ -2959,7 +2959,9 @@ typedef enum {
   CURLINFO_USED_PROXY       = CURLINFO_LONG + 66,

   CURLINFO_POSTTRANSFER_TIME_T = CURLINFO_OFF_T + 67,

   CURLINFO_EARLYDATA_SENT_T = CURLINFO_OFF_T + 68,

-  CURLINFO_LASTONE          = 68

+  CURLINFO_HTTPAUTH_USED    = CURLINFO_LONG + 69,

+  CURLINFO_PROXYAUTH_USED   = CURLINFO_LONG + 70,

+  CURLINFO_LASTONE          = 70

 } CURLINFO;

 

 /* CURLINFO_RESPONSE_CODE is the new name for the option previously known as

@@ -3230,6 +3232,50 @@ CURL_EXTERN CURLcode curl_easy_pause(CURL *handle, int bitmask);
 #define CURLPAUSE_ALL       (CURLPAUSE_RECV|CURLPAUSE_SEND)

 #define CURLPAUSE_CONT      (CURLPAUSE_RECV_CONT|CURLPAUSE_SEND_CONT)

 

+/*

+ * NAME curl_easy_ssls_import()

+ *

+ * DESCRIPTION

+ *

+ * The curl_easy_ssls_import function adds a previously exported SSL session

+ * to the SSL session cache of the easy handle (or the underlying share).

+ */

+CURL_EXTERN CURLcode curl_easy_ssls_import(CURL *handle,

+                                           const char *session_key,

+                                           const unsigned char *shmac,

+                                           size_t shmac_len,

+                                           const unsigned char *sdata,

+                                           size_t sdata_len);

+

+/* This is the curl_ssls_export_cb callback prototype. It

+ * is passed to curl_easy_ssls_export() to extract SSL sessions/tickets. */

+typedef CURLcode curl_ssls_export_cb(CURL *handle,

+                                     void *userptr,

+                                     const char *session_key,

+                                     const unsigned char *shmac,

+                                     size_t shmac_len,

+                                     const unsigned char *sdata,

+                                     size_t sdata_len,

+                                     curl_off_t valid_until,

+                                     int ietf_tls_id,

+                                     const char *alpn,

+                                     size_t earlydata_max);

+

+/*

+ * NAME curl_easy_ssls_export()

+ *

+ * DESCRIPTION

+ *

+ * The curl_easy_ssls_export function iterates over all SSL sessions stored

+ * in the easy handle (or underlying share) and invokes the passed

+ * callback.

+ *

+ */

+CURL_EXTERN CURLcode curl_easy_ssls_export(CURL *handle,

+                                           curl_ssls_export_cb *export_fn,

+                                           void *userptr);

+

+

 #ifdef  __cplusplus

 } /* end of extern "C" */

 #endif

diff --git a/libs/libcurl/include/curl/curlver.h b/libs/libcurl/include/curl/curlver.h
index 4d1f60896d..a92f042c59 100644
--- a/libs/libcurl/include/curl/curlver.h
+++ b/libs/libcurl/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.11.1"

+#define LIBCURL_VERSION "8.12.1"

 

 /* The numeric version number is also available "in parts" by using these

    defines: */

 #define LIBCURL_VERSION_MAJOR 8

-#define LIBCURL_VERSION_MINOR 11

+#define LIBCURL_VERSION_MINOR 12

 #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 0x080b01

+#define LIBCURL_VERSION_NUM 0x080c01

 

 /*

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

+#define LIBCURL_TIMESTAMP "2025-02-13"

 

 #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/easy.h b/libs/libcurl/include/curl/easy.h
index f21588d820..81c4b0f386 100644
--- a/libs/libcurl/include/curl/easy.h
+++ b/libs/libcurl/include/curl/easy.h
@@ -78,7 +78,7 @@ CURL_EXTERN CURL *curl_easy_duphandle(CURL *curl);
  *

  * DESCRIPTION

  *

- * Re-initializes a CURL handle to the default values. This puts back the

+ * Re-initializes a curl handle to the default values. This puts back the

  * handle to the same state as it was in when it was just created.

  *

  * It does keep: live connections, the Session ID cache, the DNS cache and the

diff --git a/libs/libcurl/include/curl/system.h b/libs/libcurl/include/curl/system.h
index 58e95943af..7479ee396b 100644
--- a/libs/libcurl/include/curl/system.h
+++ b/libs/libcurl/include/curl/system.h
@@ -52,62 +52,24 @@
  *

  */

 

-#if defined(__DJGPP__) || defined(__GO32__)

-#  if defined(__DJGPP__) && (__DJGPP__ > 1)

-#    define CURL_TYPEOF_CURL_OFF_T     long long

-#    define CURL_FORMAT_CURL_OFF_T     "lld"

-#    define CURL_FORMAT_CURL_OFF_TU    "llu"

-#    define CURL_SUFFIX_CURL_OFF_T     LL

-#    define CURL_SUFFIX_CURL_OFF_TU    ULL

-#  else

-#    define CURL_TYPEOF_CURL_OFF_T     long

-#    define CURL_FORMAT_CURL_OFF_T     "ld"

-#    define CURL_FORMAT_CURL_OFF_TU    "lu"

-#    define CURL_SUFFIX_CURL_OFF_T     L

-#    define CURL_SUFFIX_CURL_OFF_TU    UL

-#  endif

-#  define CURL_TYPEOF_CURL_SOCKLEN_T int

-

-#elif defined(__SALFORDC__)

-#  define CURL_TYPEOF_CURL_OFF_T     long

-#  define CURL_FORMAT_CURL_OFF_T     "ld"

-#  define CURL_FORMAT_CURL_OFF_TU    "lu"

-#  define CURL_SUFFIX_CURL_OFF_T     L

-#  define CURL_SUFFIX_CURL_OFF_TU    UL

+#if defined(__DJGPP__)

+#  define CURL_TYPEOF_CURL_OFF_T     long long

+#  define CURL_FORMAT_CURL_OFF_T     "lld"

+#  define CURL_FORMAT_CURL_OFF_TU    "llu"

+#  define CURL_SUFFIX_CURL_OFF_T     LL

+#  define CURL_SUFFIX_CURL_OFF_TU    ULL

 #  define CURL_TYPEOF_CURL_SOCKLEN_T int

 

 #elif defined(__BORLANDC__)

-#  if (__BORLANDC__ < 0x520)

-#    define CURL_TYPEOF_CURL_OFF_T     long

-#    define CURL_FORMAT_CURL_OFF_T     "ld"

-#    define CURL_FORMAT_CURL_OFF_TU    "lu"

-#    define CURL_SUFFIX_CURL_OFF_T     L

-#    define CURL_SUFFIX_CURL_OFF_TU    UL

-#  else

-#    define CURL_TYPEOF_CURL_OFF_T     __int64

-#    define CURL_FORMAT_CURL_OFF_T     "I64d"

-#    define CURL_FORMAT_CURL_OFF_TU    "I64u"

-#    define CURL_SUFFIX_CURL_OFF_T     i64

-#    define CURL_SUFFIX_CURL_OFF_TU    ui64

-#  endif

-#  define CURL_TYPEOF_CURL_SOCKLEN_T int

-

-#elif defined(__TURBOC__)

-#  define CURL_TYPEOF_CURL_OFF_T     long

-#  define CURL_FORMAT_CURL_OFF_T     "ld"

-#  define CURL_FORMAT_CURL_OFF_TU    "lu"

-#  define CURL_SUFFIX_CURL_OFF_T     L

-#  define CURL_SUFFIX_CURL_OFF_TU    UL

+#  define CURL_TYPEOF_CURL_OFF_T     __int64

+#  define CURL_FORMAT_CURL_OFF_T     "I64d"

+#  define CURL_FORMAT_CURL_OFF_TU    "I64u"

+#  define CURL_SUFFIX_CURL_OFF_T     i64

+#  define CURL_SUFFIX_CURL_OFF_TU    ui64

 #  define CURL_TYPEOF_CURL_SOCKLEN_T int

 

 #elif defined(__POCC__)

-#  if (__POCC__ < 280)

-#    define CURL_TYPEOF_CURL_OFF_T     long

-#    define CURL_FORMAT_CURL_OFF_T     "ld"

-#    define CURL_FORMAT_CURL_OFF_TU    "lu"

-#    define CURL_SUFFIX_CURL_OFF_T     L

-#    define CURL_SUFFIX_CURL_OFF_TU    UL

-#  elif defined(_MSC_VER)

+#  if defined(_MSC_VER)

 #    define CURL_TYPEOF_CURL_OFF_T     __int64

 #    define CURL_FORMAT_CURL_OFF_T     "I64d"

 #    define CURL_FORMAT_CURL_OFF_TU    "I64u"

@@ -159,15 +121,21 @@
 #  define CURL_TYPEOF_CURL_SOCKLEN_T unsigned int

 

 #elif defined(__TANDEM)

-# if ! defined(__LP64)

-   /* Required for 32-bit NonStop builds only. */

-#  define CURL_TYPEOF_CURL_OFF_T     long long

-#  define CURL_FORMAT_CURL_OFF_T     "lld"

-#  define CURL_FORMAT_CURL_OFF_TU    "llu"

-#  define CURL_SUFFIX_CURL_OFF_T     LL

-#  define CURL_SUFFIX_CURL_OFF_TU    ULL

-#  define CURL_TYPEOF_CURL_SOCKLEN_T int

-# endif

+#  if !defined(__LP64)

+#    define CURL_TYPEOF_CURL_OFF_T     long long

+#    define CURL_FORMAT_CURL_OFF_T     "lld"

+#    define CURL_FORMAT_CURL_OFF_TU    "llu"

+#    define CURL_SUFFIX_CURL_OFF_T     LL

+#    define CURL_SUFFIX_CURL_OFF_TU    ULL

+#    define CURL_TYPEOF_CURL_SOCKLEN_T int

+#  else

+#    define CURL_TYPEOF_CURL_OFF_T     long

+#    define CURL_FORMAT_CURL_OFF_T     "ld"

+#    define CURL_FORMAT_CURL_OFF_TU    "lu"

+#    define CURL_SUFFIX_CURL_OFF_T     L

+#    define CURL_SUFFIX_CURL_OFF_TU    UL

+#    define CURL_TYPEOF_CURL_SOCKLEN_T unsigned int

+#  endif

 

 #elif defined(_WIN32_WCE)

 #  define CURL_TYPEOF_CURL_OFF_T     __int64

@@ -220,13 +188,7 @@
 #    define CURL_FORMAT_CURL_OFF_TU    "llu"

 #    define CURL_SUFFIX_CURL_OFF_T     LL

 #    define CURL_SUFFIX_CURL_OFF_TU    ULL

-#  elif defined(_LP64)

-#    define CURL_TYPEOF_CURL_OFF_T     long

-#    define CURL_FORMAT_CURL_OFF_T     "ld"

-#    define CURL_FORMAT_CURL_OFF_TU    "lu"

-#    define CURL_SUFFIX_CURL_OFF_T     L

-#    define CURL_SUFFIX_CURL_OFF_TU    UL

-#  else

+#  else /* _LP64 and default */

 #    define CURL_TYPEOF_CURL_OFF_T     long

 #    define CURL_FORMAT_CURL_OFF_T     "ld"

 #    define CURL_FORMAT_CURL_OFF_TU    "lu"

@@ -239,22 +201,13 @@
 

 #elif defined(__370__)

 #  if defined(__IBMC__) || defined(__IBMCPP__)

-#    if defined(_ILP32)

-#    elif defined(_LP64)

-#    endif

 #    if defined(_LONG_LONG)

 #      define CURL_TYPEOF_CURL_OFF_T     long long

 #      define CURL_FORMAT_CURL_OFF_T     "lld"

 #      define CURL_FORMAT_CURL_OFF_TU    "llu"

 #      define CURL_SUFFIX_CURL_OFF_T     LL

 #      define CURL_SUFFIX_CURL_OFF_TU    ULL

-#    elif defined(_LP64)

-#      define CURL_TYPEOF_CURL_OFF_T     long

-#      define CURL_FORMAT_CURL_OFF_T     "ld"

-#      define CURL_FORMAT_CURL_OFF_TU    "lu"

-#      define CURL_SUFFIX_CURL_OFF_T     L

-#      define CURL_SUFFIX_CURL_OFF_TU    UL

-#    else

+#    else /* _LP64 and default */

 #      define CURL_TYPEOF_CURL_OFF_T     long

 #      define CURL_FORMAT_CURL_OFF_T     "ld"

 #      define CURL_FORMAT_CURL_OFF_TU    "lu"

@@ -349,24 +302,15 @@
 #elif defined(_MSC_VER)

 #  if (_MSC_VER >= 1800)

 #    include <inttypes.h>

-#    define CURL_TYPEOF_CURL_OFF_T     __int64

 #    define CURL_FORMAT_CURL_OFF_T     PRId64

 #    define CURL_FORMAT_CURL_OFF_TU    PRIu64

-#    define CURL_SUFFIX_CURL_OFF_T     i64

-#    define CURL_SUFFIX_CURL_OFF_TU    ui64

-#  elif (_MSC_VER >= 900) && (_INTEGRAL_MAX_BITS >= 64)

-#    define CURL_TYPEOF_CURL_OFF_T     __int64

+#  else

 #    define CURL_FORMAT_CURL_OFF_T     "I64d"

 #    define CURL_FORMAT_CURL_OFF_TU    "I64u"

-#    define CURL_SUFFIX_CURL_OFF_T     i64

-#    define CURL_SUFFIX_CURL_OFF_TU    ui64

-#  else

-#    define CURL_TYPEOF_CURL_OFF_T     long

-#    define CURL_FORMAT_CURL_OFF_T     "ld"

-#    define CURL_FORMAT_CURL_OFF_TU    "lu"

-#    define CURL_SUFFIX_CURL_OFF_T     L

-#    define CURL_SUFFIX_CURL_OFF_TU    UL

 #  endif

+#  define CURL_TYPEOF_CURL_OFF_T     __int64

+#  define CURL_SUFFIX_CURL_OFF_T     i64

+#  define CURL_SUFFIX_CURL_OFF_TU    ui64

 #  define CURL_TYPEOF_CURL_SOCKLEN_T int

 

 /* ===================================== */

@@ -403,12 +347,12 @@
 

 #else

 /* generic "safe guess" on old 32-bit style */

-# define CURL_TYPEOF_CURL_OFF_T     long

-# define CURL_FORMAT_CURL_OFF_T     "ld"

-# define CURL_FORMAT_CURL_OFF_TU    "lu"

-# define CURL_SUFFIX_CURL_OFF_T     L

-# define CURL_SUFFIX_CURL_OFF_TU    UL

-# define CURL_TYPEOF_CURL_SOCKLEN_T int

+#  define CURL_TYPEOF_CURL_OFF_T     long

+#  define CURL_FORMAT_CURL_OFF_T     "ld"

+#  define CURL_FORMAT_CURL_OFF_TU    "lu"

+#  define CURL_SUFFIX_CURL_OFF_T     L

+#  define CURL_SUFFIX_CURL_OFF_TU    UL

+#  define CURL_TYPEOF_CURL_SOCKLEN_T int

 #endif

 

 #ifdef _AIX

@@ -462,7 +406,7 @@
 

 #if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus) || \

   defined(__HP_aCC) || defined(__BORLANDC__) || defined(__LCC__) || \

-  defined(__POCC__) || defined(__SALFORDC__) || defined(__HIGHC__) || \

+  defined(__POCC__) || defined(__HIGHC__) || \

   defined(__ILEC400__)

   /* This compiler is believed to have an ISO compatible preprocessor */

 #define CURL_ISOCPP