libcurl: update to 8.10.0

4 files changed, 26 insertions, 18 deletions

diff --git a/libs/libcurl/include/curl/curl.h b/libs/libcurl/include/curl/curl.h
index f2feb26eb9..9fc97f0d7f 100644
--- a/libs/libcurl/include/curl/curl.h
+++ b/libs/libcurl/include/curl/curl.h
@@ -76,7 +76,7 @@
 #if defined(_WIN32) && !defined(_WIN32_WCE) && !defined(__CYGWIN__)

 #if !(defined(_WINSOCKAPI_) || defined(_WINSOCK_H) || \

       defined(__LWIP_OPT_H__) || defined(LWIP_HDR_OPT_H))

-/* The check above prevents the winsock2 inclusion if winsock.h already was

+/* The check above prevents the winsock2.h inclusion if winsock.h already was

    included, since they cannot co-exist without problems */

 #include <winsock2.h>

 #include <ws2tcpip.h>

@@ -721,6 +721,8 @@ typedef enum {
    with them. */

 #define CURLOPT_WRITEINFO CURLOPT_OBSOLETE40

 #define CURLOPT_CLOSEPOLICY CURLOPT_OBSOLETE72

+#define CURLOPT_OBSOLETE72 9999

+#define CURLOPT_OBSOLETE40 9999

 

 #endif /* !CURL_NO_OLDIES */

 

@@ -1250,8 +1252,7 @@ typedef enum {
   /* send linked-list of post-transfer QUOTE commands */

   CURLOPT(CURLOPT_POSTQUOTE, CURLOPTTYPE_SLISTPOINT, 39),

 

-   /* OBSOLETE, do not use! */

-  CURLOPT(CURLOPT_OBSOLETE40, CURLOPTTYPE_OBJECTPOINT, 40),

+  /* 40 is not used */

 

   /* talk a lot */

   CURLOPT(CURLOPT_VERBOSE, CURLOPTTYPE_LONG, 41),

@@ -1352,9 +1353,7 @@ typedef enum {
   /* Max amount of cached alive connections */

   CURLOPT(CURLOPT_MAXCONNECTS, CURLOPTTYPE_LONG, 71),

 

-  /* OBSOLETE, do not use! */

-  CURLOPT(CURLOPT_OBSOLETE72, CURLOPTTYPE_LONG, 72),

-

+  /* 72 = OBSOLETE */

   /* 73 = OBSOLETE */

 

   /* Set to explicitly use a new connection for the upcoming transfer.

@@ -1398,7 +1397,7 @@ typedef enum {
      operation. Set filename to "-" (dash) to make it go to stdout. */

   CURLOPT(CURLOPT_COOKIEJAR, CURLOPTTYPE_STRINGPOINT, 82),

 

-  /* Specify which SSL ciphers to use */

+  /* Specify which TLS 1.2 (1.1, 1.0) ciphers to use */

   CURLOPT(CURLOPT_SSL_CIPHER_LIST, CURLOPTTYPE_STRINGPOINT, 83),

 

   /* Specify which HTTP version to use! This must be set to one of the

@@ -2022,7 +2021,7 @@ typedef enum {
   /* password for the SSL private key for proxy */

   CURLOPT(CURLOPT_PROXY_KEYPASSWD, CURLOPTTYPE_STRINGPOINT, 258),

 

-  /* Specify which SSL ciphers to use for proxy */

+  /* Specify which TLS 1.2 (1.1, 1.0) ciphers to use for proxy */

   CURLOPT(CURLOPT_PROXY_SSL_CIPHER_LIST, CURLOPTTYPE_STRINGPOINT, 259),

 

   /* CRL file for proxy */

@@ -2203,7 +2202,7 @@ typedef enum {
   /* specify which protocols that libcurl is allowed to follow directs to */

   CURLOPT(CURLOPT_REDIR_PROTOCOLS_STR, CURLOPTTYPE_STRINGPOINT, 319),

 

-  /* websockets options */

+  /* WebSockets options */

   CURLOPT(CURLOPT_WS_OPTIONS, CURLOPTTYPE_LONG, 320),

 

   /* CA cache timeout */

@@ -2645,7 +2644,7 @@ CURL_EXTERN char *curl_getenv(const char *variable);
  *

  * DESCRIPTION

  *

- * Returns a static ascii string of the libcurl version.

+ * Returns a static ASCII string of the libcurl version.

  */

 CURL_EXTERN char *curl_version(void);

 

@@ -2953,7 +2952,8 @@ typedef enum {
   CURLINFO_CONN_ID          = CURLINFO_OFF_T + 64,

   CURLINFO_QUEUE_TIME_T     = CURLINFO_OFF_T + 65,

   CURLINFO_USED_PROXY       = CURLINFO_LONG + 66,

-  CURLINFO_LASTONE          = 66

+  CURLINFO_POSTTRANSFER_TIME_T = CURLINFO_OFF_T + 67,

+  CURLINFO_LASTONE          = 67

 } CURLINFO;

 

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

@@ -3236,7 +3236,9 @@ CURL_EXTERN CURLcode curl_easy_pause(CURL *handle, int bitmask);
 #include "options.h"

 #include "header.h"

 #include "websockets.h"

+#ifndef CURL_SKIP_INCLUDE_MPRINTF

 #include "mprintf.h"

+#endif

 

 /* the typechecker does not work in C++ (yet) */

 #if defined(__GNUC__) && defined(__GNUC_MINOR__) && \

diff --git a/libs/libcurl/include/curl/curlver.h b/libs/libcurl/include/curl/curlver.h
index 02d45da8df..8c81b42d15 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.9.1"

+#define LIBCURL_VERSION "8.10.0"

 

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

    defines: */

 #define LIBCURL_VERSION_MAJOR 8

-#define LIBCURL_VERSION_MINOR 9

-#define LIBCURL_VERSION_PATCH 1

+#define LIBCURL_VERSION_MINOR 10

+#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 0x080901

+#define LIBCURL_VERSION_NUM 0x080a00

 

 /*

  * 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-07-31"

+#define LIBCURL_TIMESTAMP "2024-09-11"

 

 #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 fe27d98c1d..9fb67c1abd 100644
--- a/libs/libcurl/include/curl/mprintf.h
+++ b/libs/libcurl/include/curl/mprintf.h
@@ -32,13 +32,18 @@
 extern "C" {

 #endif

 

+#ifndef CURL_TEMP_PRINTF

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

   defined(__IAR_SYSTEMS_ICC__)) &&                                      \

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

   !defined(CURL_NO_FMT_CHECKS)

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

+#if defined(__MINGW_PRINTF_FORMAT)  /* mingw-w64 3.0.0+. Needs stdio.h. */

 #define CURL_TEMP_PRINTF(fmt, arg) \

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

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

+#else

+#define CURL_TEMP_PRINTF(fmt, arg)

+#endif

 #else

 #define CURL_TEMP_PRINTF(fmt, arg) \

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

@@ -46,6 +51,7 @@ extern "C" {
 #else

 #define CURL_TEMP_PRINTF(fmt, arg)

 #endif

+#endif

 

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

   CURL_TEMP_PRINTF(1, 2);

diff --git a/libs/libcurl/include/curl/system.h b/libs/libcurl/include/curl/system.h
index 5285aa0043..58e95943af 100644
--- a/libs/libcurl/include/curl/system.h
+++ b/libs/libcurl/include/curl/system.h
@@ -31,7 +31,7 @@
  * changed.

  *

  * In order to differentiate between platforms/compilers/architectures use

- * only compiler built in predefined preprocessor symbols.

+ * only compiler built-in predefined preprocessor symbols.

  *

  * curl_off_t

  * ----------