libcurl: update to 8.3.0

6 files changed, 74 insertions, 22 deletions

diff --git a/libs/libcurl/include/curl/curl.h b/libs/libcurl/include/curl/curl.h
index b6cc8e8795..0432a2cdd7 100644
--- a/libs/libcurl/include/curl/curl.h
+++ b/libs/libcurl/include/curl/curl.h
@@ -161,7 +161,7 @@ typedef enum {
   CURLSSLBACKEND_GNUTLS = 2,

   CURLSSLBACKEND_NSS = 3,

   CURLSSLBACKEND_OBSOLETE4 = 4,  /* Was QSOSSL. */

-  CURLSSLBACKEND_GSKIT = 5,

+  CURLSSLBACKEND_GSKIT                  CURL_DEPRECATED(8.3.0, "") = 5,

   CURLSSLBACKEND_POLARSSL               CURL_DEPRECATED(7.69.0, "") = 6,

   CURLSSLBACKEND_WOLFSSL = 7,

   CURLSSLBACKEND_SCHANNEL = 8,

@@ -2731,6 +2731,20 @@ CURL_EXTERN CURLcode curl_global_init_mem(long flags,
  */

 CURL_EXTERN void curl_global_cleanup(void);

 

+/*

+ * NAME curl_global_trace()

+ *

+ * DESCRIPTION

+ *

+ * curl_global_trace() can be invoked at application start to

+ * configure which components in curl should participate in tracing.

+

+ * This function is thread-safe if CURL_VERSION_THREADSAFE is set in the

+ * curl_version_info_data.features flag (fetch by curl_version_info()).

+

+ */

+CURL_EXTERN CURLcode curl_global_trace(const char *config);

+

 /* linked-list structure for the CURLOPT_QUOTE option (and other) */

 struct curl_slist {

   char *data;

@@ -2810,13 +2824,14 @@ CURL_EXTERN void curl_slist_free_all(struct curl_slist *list);
  */

 CURL_EXTERN time_t curl_getdate(const char *p, const time_t *unused);

 

-/* info about the certificate chain, only for OpenSSL, GnuTLS, Schannel, NSS

-   and GSKit builds. Asked for with CURLOPT_CERTINFO / CURLINFO_CERTINFO */

+/* info about the certificate chain, for SSL backends that support it. Asked

+   for with CURLOPT_CERTINFO / CURLINFO_CERTINFO */

 struct curl_certinfo {

   int num_of_certs;             /* number of certificates with information */

   struct curl_slist **certinfo; /* for each index in this array, there's a

-                                   linked list with textual information in the

-                                   format "name: value" */

+                                   linked list with textual information for a

+                                   certificate in the format "name:content".

+                                   eg "Subject:foo", "Issuer:bar", etc. */

 };

 

 /* Information about the SSL library used and the respective internal SSL

diff --git a/libs/libcurl/include/curl/curlver.h b/libs/libcurl/include/curl/curlver.h
index b85f767b2f..ac9fd9673d 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.2.1"

+#define LIBCURL_VERSION "8.3.0"

 

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

    defines: */

 #define LIBCURL_VERSION_MAJOR 8

-#define LIBCURL_VERSION_MINOR 2

-#define LIBCURL_VERSION_PATCH 1

+#define LIBCURL_VERSION_MINOR 3

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

+#define LIBCURL_VERSION_NUM 0x080300

 

 /*

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

+#define LIBCURL_TIMESTAMP "2023-09-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/mprintf.h b/libs/libcurl/include/curl/mprintf.h
index 93be4e1f62..b344c8c830 100644
--- a/libs/libcurl/include/curl/mprintf.h
+++ b/libs/libcurl/include/curl/mprintf.h
@@ -32,18 +32,36 @@
 extern "C" {

 #endif

 

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

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

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

+#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)))

+#else

+#define CURL_TEMP_PRINTF(a,b)

+#endif

+

+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_EXTERN int curl_mvprintf(const char *format, va_list args);

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

-CURL_EXTERN int curl_mvsprintf(char *buffer, const char *format, va_list args);

+                               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)

+  CURL_TEMP_PRINTF(2, 0);

+CURL_EXTERN int curl_mvsprintf(char *buffer, const char *format, va_list args)

+  CURL_TEMP_PRINTF(2, 0);

 CURL_EXTERN int curl_mvsnprintf(char *buffer, size_t maxlength,

-                                const char *format, va_list args);

-CURL_EXTERN char *curl_maprintf(const char *format, ...);

-CURL_EXTERN char *curl_mvaprintf(const char *format, va_list args);

+                                const char *format, va_list args)

+  CURL_TEMP_PRINTF(3, 0);

+CURL_EXTERN char *curl_maprintf(const char *format, ...)

+  CURL_TEMP_PRINTF(1, 2);

+CURL_EXTERN char *curl_mvaprintf(const char *format, va_list args)

+  CURL_TEMP_PRINTF(1, 0);

+

+#undef CURL_TEMP_PRINTF

 

 #ifdef  __cplusplus

 } /* end of extern "C" */

diff --git a/libs/libcurl/include/curl/multi.h b/libs/libcurl/include/curl/multi.h
index 7a7a1ec229..caa948953c 100644
--- a/libs/libcurl/include/curl/multi.h
+++ b/libs/libcurl/include/curl/multi.h
@@ -118,7 +118,7 @@ typedef struct CURLMsg CURLMsg;
 struct curl_waitfd {

   curl_socket_t fd;

   short events;

-  short revents; /* not supported yet */

+  short revents;

 };

 

 /*

diff --git a/libs/libcurl/include/curl/system.h b/libs/libcurl/include/curl/system.h
index 556ffa9c9b..9a32e26d63 100644
--- a/libs/libcurl/include/curl/system.h
+++ b/libs/libcurl/include/curl/system.h
@@ -347,6 +347,24 @@
 #  define CURL_PULL_SYS_TYPES_H      1

 #  define CURL_PULL_SYS_SOCKET_H     1

 

+#elif defined(__hpux) /* HP aCC compiler */

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

+#  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 socklen_t

+#  define CURL_PULL_SYS_TYPES_H      1

+#  define CURL_PULL_SYS_SOCKET_H     1

+

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

 /*    KEEP MSVC THE PENULTIMATE ENTRY    */

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

diff --git a/libs/libcurl/include/curl/urlapi.h b/libs/libcurl/include/curl/urlapi.h
index 2440c1affc..1c9b11fec5 100644
--- a/libs/libcurl/include/curl/urlapi.h
+++ b/libs/libcurl/include/curl/urlapi.h
@@ -96,7 +96,8 @@ typedef enum {
 #define CURLU_NO_AUTHORITY (1<<10)      /* Allow empty authority when the

                                            scheme is unknown. */

 #define CURLU_ALLOW_SPACE (1<<11)       /* Allow spaces in the URL */

-#define CURLU_PUNYCODE (1<<12)          /* get the host name in pynycode */

+#define CURLU_PUNYCODE (1<<12)          /* get the host name in punycode */

+#define CURLU_PUNY2IDN (1<<13)          /* punycode => IDN conversion */

 

 typedef struct Curl_URL CURLU;