libcurl: update to 8.6.0

5 files changed, 27 insertions, 22 deletions

diff --git a/libs/libcurl/include/curl/curl.h b/libs/libcurl/include/curl/curl.h
index 1f6c5764c6..e69cb4fc17 100644
--- a/libs/libcurl/include/curl/curl.h
+++ b/libs/libcurl/include/curl/curl.h
@@ -631,6 +631,7 @@ typedef enum {
   CURLE_PROXY,                   /* 97 - proxy handshake error */

   CURLE_SSL_CLIENTCERT,          /* 98 - client-side certificate required */

   CURLE_UNRECOVERABLE_POLL,      /* 99 - poll/select returned fatal error */

+  CURLE_TOO_LARGE,               /* 100 - a value/data met its maximum */

   CURL_LAST /* never use! */

 } CURLcode;

 

@@ -1845,7 +1846,8 @@ typedef enum {
   /* allow GSSAPI credential delegation */

   CURLOPT(CURLOPT_GSSAPI_DELEGATION, CURLOPTTYPE_VALUES, 210),

 

-  /* Set the name servers to use for DNS resolution */

+  /* Set the name servers to use for DNS resolution.

+   * Only supported by the c-ares DNS backend */

   CURLOPT(CURLOPT_DNS_SERVERS, CURLOPTTYPE_STRINGPOINT, 211),

 

   /* Time-out accept operations (currently for FTP only) after this amount

@@ -2201,6 +2203,9 @@ typedef enum {
   /* set a specific client IP for HAProxy PROXY protocol header? */

   CURLOPT(CURLOPT_HAPROXY_CLIENT_IP, CURLOPTTYPE_STRINGPOINT, 323),

 

+  /* millisecond version */

+  CURLOPT(CURLOPT_SERVER_RESPONSE_TIMEOUT_MS, CURLOPTTYPE_LONG, 324),

+

   CURLOPT_LASTENTRY /* the last unused */

 } CURLoption;

 

@@ -2932,7 +2937,8 @@ typedef enum {
   CURLINFO_CAPATH           = CURLINFO_STRING + 62,

   CURLINFO_XFER_ID          = CURLINFO_OFF_T + 63,

   CURLINFO_CONN_ID          = CURLINFO_OFF_T + 64,

-  CURLINFO_LASTONE          = 64

+  CURLINFO_QUEUE_TIME_T     = CURLINFO_OFF_T + 65,

+  CURLINFO_LASTONE          = 65

 } 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 e54a5e6138..8d3879a30a 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.5.0"

+#define LIBCURL_VERSION "8.6.0"

 

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

    defines: */

 #define LIBCURL_VERSION_MAJOR 8

-#define LIBCURL_VERSION_MINOR 5

+#define LIBCURL_VERSION_MINOR 6

 #define LIBCURL_VERSION_PATCH 0

 

 /* 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 0x080500

+#define LIBCURL_VERSION_NUM 0x080600

 

 /*

  * This is the date and time when the full source package was created. The

@@ -70,7 +70,7 @@
  *

  * "2007-11-23"

  */

-#define LIBCURL_TIMESTAMP "2023-12-06"

+#define LIBCURL_TIMESTAMP "2024-01-31"

 

 #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/mprintf.h b/libs/libcurl/include/curl/mprintf.h
index b344c8c830..7880024983 100644
--- a/libs/libcurl/include/curl/mprintf.h
+++ b/libs/libcurl/include/curl/mprintf.h
@@ -34,19 +34,27 @@ extern "C" {
 

 #if (defined(__GNUC__) || defined(__clang__)) &&                        \

   defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) &&         \

-  !defined(__MINGW32__) && !defined(CURL_NO_FMT_CHECKS)

-#define CURL_TEMP_PRINTF(a,b) __attribute__ ((format(printf, a, b)))

+  !defined(CURL_NO_FMT_CHECKS)

+#if defined(__MINGW32__) && !defined(__clang__)

+#define CURL_TEMP_PRINTF(fmt, arg) \

+  __attribute__((format(gnu_printf, fmt, arg)))

 #else

-#define CURL_TEMP_PRINTF(a,b)

+#define CURL_TEMP_PRINTF(fmt, arg) \

+  __attribute__((format(printf, fmt, arg)))

+#endif

+#else

+#define CURL_TEMP_PRINTF(fmt, arg)

 #endif

 

-CURL_EXTERN int curl_mprintf(const char *format, ...) CURL_TEMP_PRINTF(1, 2);

+CURL_EXTERN int curl_mprintf(const char *format, ...)

+  CURL_TEMP_PRINTF(1, 2);

 CURL_EXTERN int curl_mfprintf(FILE *fd, const char *format, ...)

   CURL_TEMP_PRINTF(2, 3);

 CURL_EXTERN int curl_msprintf(char *buffer, const char *format, ...)

   CURL_TEMP_PRINTF(2, 3);

 CURL_EXTERN int curl_msnprintf(char *buffer, size_t maxlength,

-                               const char *format, ...) CURL_TEMP_PRINTF(3, 4);

+                               const char *format, ...)

+  CURL_TEMP_PRINTF(3, 4);

 CURL_EXTERN int curl_mvprintf(const char *format, va_list args)

   CURL_TEMP_PRINTF(1, 0);

 CURL_EXTERN int curl_mvfprintf(FILE *fd, const char *format, va_list args)

diff --git a/libs/libcurl/include/curl/system.h b/libs/libcurl/include/curl/system.h
index 40044a4ee3..01ff338b15 100644
--- a/libs/libcurl/include/curl/system.h
+++ b/libs/libcurl/include/curl/system.h
@@ -184,9 +184,8 @@
 #  define CURL_FORMAT_CURL_OFF_TU    PRIu64

 #  define CURL_SUFFIX_CURL_OFF_T     LL

 #  define CURL_SUFFIX_CURL_OFF_TU    ULL

-#  define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t

+#  define CURL_TYPEOF_CURL_SOCKLEN_T int

 #  define CURL_PULL_SYS_TYPES_H      1

-#  define CURL_PULL_WS2TCPIP_H       1

 

 #elif defined(__VMS)

 #  if defined(__VAX)

@@ -417,15 +416,6 @@
 #define CURL_PULL_SYS_POLL_H

 #endif

 

-

-/* CURL_PULL_WS2TCPIP_H is defined above when inclusion of header file  */

-/* ws2tcpip.h is required here to properly make type definitions below. */

-#ifdef CURL_PULL_WS2TCPIP_H

-#  include <winsock2.h>

-#  include <windows.h>

-#  include <ws2tcpip.h>

-#endif

-

 /* CURL_PULL_SYS_TYPES_H is defined above when inclusion of header file  */

 /* sys/types.h is required here to properly make type definitions below. */

 #ifdef CURL_PULL_SYS_TYPES_H

diff --git a/libs/libcurl/include/curl/urlapi.h b/libs/libcurl/include/curl/urlapi.h
index 1c9b11fec5..f5f2a2b771 100644
--- a/libs/libcurl/include/curl/urlapi.h
+++ b/libs/libcurl/include/curl/urlapi.h
@@ -63,6 +63,7 @@ typedef enum {
   CURLUE_BAD_SLASHES,         /* 28 */

   CURLUE_BAD_USER,            /* 29 */

   CURLUE_LACKS_IDN,           /* 30 */

+  CURLUE_TOO_LARGE,           /* 31 */

   CURLUE_LAST

 } CURLUcode;