libcurl: update to 8.8.0

5 files changed, 64 insertions, 39 deletions

diff --git a/libs/libcurl/include/curl/curl.h b/libs/libcurl/include/curl/curl.h
index 3775ac8af9..48e28f543b 100644
--- a/libs/libcurl/include/curl/curl.h
+++ b/libs/libcurl/include/curl/curl.h
@@ -632,6 +632,7 @@ typedef enum {
   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 */

+  CURLE_ECH_REQUIRED,            /* 101 - ECH tried but failed */

   CURL_LAST /* never use! */

 } CURLcode;

 

@@ -811,7 +812,10 @@ typedef enum {
 #define CURLAUTH_GSSAPI CURLAUTH_NEGOTIATE

 #define CURLAUTH_NTLM         (((unsigned long)1)<<3)

 #define CURLAUTH_DIGEST_IE    (((unsigned long)1)<<4)

+#ifndef CURL_NO_OLDIES

+  /* functionality removed since 8.8.0 */

 #define CURLAUTH_NTLM_WB      (((unsigned long)1)<<5)

+#endif

 #define CURLAUTH_BEARER       (((unsigned long)1)<<6)

 #define CURLAUTH_AWS_SIGV4    (((unsigned long)1)<<7)

 #define CURLAUTH_ONLY         (((unsigned long)1)<<31)

@@ -2206,6 +2210,9 @@ typedef enum {
   /* millisecond version */

   CURLOPT(CURLOPT_SERVER_RESPONSE_TIMEOUT_MS, CURLOPTTYPE_LONG, 324),

 

+  /* set ECH configuration  */

+  CURLOPT(CURLOPT_ECH, CURLOPTTYPE_STRINGPOINT, 325),

+

   CURLOPT_LASTENTRY /* the last unused */

 } CURLoption;

 

@@ -2311,30 +2318,26 @@ enum CURL_NETRC_OPTION {
   CURL_NETRC_LAST

 };

 

-enum {

-  CURL_SSLVERSION_DEFAULT,

-  CURL_SSLVERSION_TLSv1, /* TLS 1.x */

-  CURL_SSLVERSION_SSLv2,

-  CURL_SSLVERSION_SSLv3,

-  CURL_SSLVERSION_TLSv1_0,

-  CURL_SSLVERSION_TLSv1_1,

-  CURL_SSLVERSION_TLSv1_2,

-  CURL_SSLVERSION_TLSv1_3,

-

-  CURL_SSLVERSION_LAST /* never use, keep last */

-};

+#define CURL_SSLVERSION_DEFAULT 0

+#define CURL_SSLVERSION_TLSv1   1 /* TLS 1.x */

+#define CURL_SSLVERSION_SSLv2   2

+#define CURL_SSLVERSION_SSLv3   3

+#define CURL_SSLVERSION_TLSv1_0 4

+#define CURL_SSLVERSION_TLSv1_1 5

+#define CURL_SSLVERSION_TLSv1_2 6

+#define CURL_SSLVERSION_TLSv1_3 7

 

-enum {

-  CURL_SSLVERSION_MAX_NONE =     0,

-  CURL_SSLVERSION_MAX_DEFAULT =  (CURL_SSLVERSION_TLSv1   << 16),

-  CURL_SSLVERSION_MAX_TLSv1_0 =  (CURL_SSLVERSION_TLSv1_0 << 16),

-  CURL_SSLVERSION_MAX_TLSv1_1 =  (CURL_SSLVERSION_TLSv1_1 << 16),

-  CURL_SSLVERSION_MAX_TLSv1_2 =  (CURL_SSLVERSION_TLSv1_2 << 16),

-  CURL_SSLVERSION_MAX_TLSv1_3 =  (CURL_SSLVERSION_TLSv1_3 << 16),

+#define CURL_SSLVERSION_LAST 8 /* never use, keep last */

+

+#define CURL_SSLVERSION_MAX_NONE 0

+#define CURL_SSLVERSION_MAX_DEFAULT (CURL_SSLVERSION_TLSv1   << 16)

+#define CURL_SSLVERSION_MAX_TLSv1_0 (CURL_SSLVERSION_TLSv1_0 << 16)

+#define CURL_SSLVERSION_MAX_TLSv1_1 (CURL_SSLVERSION_TLSv1_1 << 16)

+#define CURL_SSLVERSION_MAX_TLSv1_2 (CURL_SSLVERSION_TLSv1_2 << 16)

+#define CURL_SSLVERSION_MAX_TLSv1_3 (CURL_SSLVERSION_TLSv1_3 << 16)

 

   /* never use, keep last */

-  CURL_SSLVERSION_MAX_LAST =     (CURL_SSLVERSION_LAST    << 16)

-};

+#define CURL_SSLVERSION_MAX_LAST    (CURL_SSLVERSION_LAST    << 16)

 

 enum CURL_TLSAUTH {

   CURL_TLSAUTH_NONE,

@@ -3035,17 +3038,18 @@ CURL_EXTERN CURLSHcode curl_share_cleanup(CURLSH *share);
  */

 

 typedef enum {

-  CURLVERSION_FIRST,

-  CURLVERSION_SECOND,

-  CURLVERSION_THIRD,

-  CURLVERSION_FOURTH,

-  CURLVERSION_FIFTH,

-  CURLVERSION_SIXTH,

-  CURLVERSION_SEVENTH,

-  CURLVERSION_EIGHTH,

-  CURLVERSION_NINTH,

-  CURLVERSION_TENTH,

-  CURLVERSION_ELEVENTH,

+  CURLVERSION_FIRST,    /* 7.10 */

+  CURLVERSION_SECOND,   /* 7.11.1 */

+  CURLVERSION_THIRD,    /* 7.12.0 */

+  CURLVERSION_FOURTH,   /* 7.16.1 */

+  CURLVERSION_FIFTH,    /* 7.57.0 */

+  CURLVERSION_SIXTH,    /* 7.66.0 */

+  CURLVERSION_SEVENTH,  /* 7.70.0 */

+  CURLVERSION_EIGHTH,   /* 7.72.0 */

+  CURLVERSION_NINTH,    /* 7.75.0 */

+  CURLVERSION_TENTH,    /* 7.77.0 */

+  CURLVERSION_ELEVENTH, /* 7.87.0 */

+  CURLVERSION_TWELFTH,  /* 8.8.0 */

   CURLVERSION_LAST /* never actually use this */

 } CURLversion;

 

@@ -3054,7 +3058,7 @@ typedef enum {
    meant to be a built-in version number for what kind of struct the caller

    expects. If the struct ever changes, we redefine the NOW to another enum

    from above. */

-#define CURLVERSION_NOW CURLVERSION_ELEVENTH

+#define CURLVERSION_NOW CURLVERSION_TWELFTH

 

 struct curl_version_info_data {

   CURLversion age;          /* age of the returned struct */

@@ -3114,6 +3118,9 @@ struct curl_version_info_data {
   /* These fields were added in CURLVERSION_ELEVENTH */

   /* feature_names is terminated by an entry with a NULL feature name */

   const char * const *feature_names;

+

+  /* These fields were added in CURLVERSION_TWELFTH */

+  const char *rtmp_version; /* human readable string. */

 };

 typedef struct curl_version_info_data curl_version_info_data;

 

@@ -3154,7 +3161,7 @@ typedef struct curl_version_info_data curl_version_info_data;
 #define CURL_VERSION_GSASL        (1<<29) /* libgsasl is supported */

 #define CURL_VERSION_THREADSAFE   (1<<30) /* libcurl API is thread-safe */

 

- /*

+/*

  * NAME curl_version_info()

  *

  * DESCRIPTION

diff --git a/libs/libcurl/include/curl/curlver.h b/libs/libcurl/include/curl/curlver.h
index b2ac5a66d6..7faa482afc 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.7.1"

+#define LIBCURL_VERSION "8.8.0"

 

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

    defines: */

 #define LIBCURL_VERSION_MAJOR 8

-#define LIBCURL_VERSION_MINOR 7

-#define LIBCURL_VERSION_PATCH 1

+#define LIBCURL_VERSION_MINOR 8

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

+#define LIBCURL_VERSION_NUM 0x080800

 

 /*

  * 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-03-27"

+#define LIBCURL_TIMESTAMP "2024-05-22"

 

 #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 9ea91ef7a1..9a808f1f99 100644
--- a/libs/libcurl/include/curl/multi.h
+++ b/libs/libcurl/include/curl/multi.h
@@ -464,6 +464,20 @@ typedef int (*curl_push_callback)(CURL *parent,
                                   struct curl_pushheaders *headers,

                                   void *userp);

 

+/*

+ * Name:    curl_multi_waitfds()

+ *

+ * Desc:    Ask curl for fds for polling. The app can use these to poll on.

+ *          We want curl_multi_perform() called as soon as one of them are

+ *          ready. Passing zero size allows to get just a number of fds.

+ *

+ * Returns: CURLMcode type, general multi error code.

+ */

+CURL_EXTERN CURLMcode curl_multi_waitfds(CURLM *multi,

+                                         struct curl_waitfd *ufds,

+                                         unsigned int size,

+                                         unsigned int *fd_count);

+

 #ifdef __cplusplus

 } /* end of extern "C" */

 #endif

diff --git a/libs/libcurl/include/curl/typecheck-gcc.h b/libs/libcurl/include/curl/typecheck-gcc.h
index b3fb12b358..8fd0d91e60 100644
--- a/libs/libcurl/include/curl/typecheck-gcc.h
+++ b/libs/libcurl/include/curl/typecheck-gcc.h
@@ -275,6 +275,7 @@ CURLWARNING(_curl_easy_getinfo_err_curl_off_t,
    (option) == CURLOPT_DNS_LOCAL_IP6 ||                                       \

    (option) == CURLOPT_DNS_SERVERS ||                                         \

    (option) == CURLOPT_DOH_URL ||                                             \

+   (option) == CURLOPT_ECH        ||                                          \

    (option) == CURLOPT_EGDSOCKET ||                                           \

    (option) == CURLOPT_FTP_ACCOUNT ||                                         \

    (option) == CURLOPT_FTP_ALTERNATIVE_TO_USER ||                             \

diff --git a/libs/libcurl/include/curl/urlapi.h b/libs/libcurl/include/curl/urlapi.h
index f5f2a2b771..b65735cf62 100644
--- a/libs/libcurl/include/curl/urlapi.h
+++ b/libs/libcurl/include/curl/urlapi.h
@@ -99,6 +99,9 @@ typedef enum {
 #define CURLU_ALLOW_SPACE (1<<11)       /* Allow spaces in the URL */

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

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

+#define CURLU_GET_EMPTY (1<<14)         /* allow empty queries and fragments

+                                           when extracting the URL or the

+                                           components */

 

 typedef struct Curl_URL CURLU;