libcurl: update to 8.4.0

3 files changed, 20 insertions, 9 deletions

diff --git a/libs/libcurl/include/curl/curl.h b/libs/libcurl/include/curl/curl.h
index 0432a2cdd7..05c90b7ce3 100644
--- a/libs/libcurl/include/curl/curl.h
+++ b/libs/libcurl/include/curl/curl.h
@@ -159,7 +159,7 @@ typedef enum {
   CURLSSLBACKEND_NONE = 0,

   CURLSSLBACKEND_OPENSSL = 1,

   CURLSSLBACKEND_GNUTLS = 2,

-  CURLSSLBACKEND_NSS = 3,

+  CURLSSLBACKEND_NSS                    CURL_DEPRECATED(8.3.0, "") = 3,

   CURLSSLBACKEND_OBSOLETE4 = 4,  /* Was QSOSSL. */

   CURLSSLBACKEND_GSKIT                  CURL_DEPRECATED(8.3.0, "") = 5,

   CURLSSLBACKEND_POLARSSL               CURL_DEPRECATED(7.69.0, "") = 6,

@@ -646,10 +646,10 @@ typedef enum {
 #ifndef CURL_NO_OLDIES /* define this to test if your app builds with all

                           the obsolete stuff removed! */

 

-/* Previously obsolete error code re-used in 7.38.0 */

+/* Previously obsolete error code reused in 7.38.0 */

 #define CURLE_OBSOLETE16 CURLE_HTTP2

 

-/* Previously obsolete error codes re-used in 7.24.0 */

+/* Previously obsolete error codes reused in 7.24.0 */

 #define CURLE_OBSOLETE10 CURLE_FTP_ACCEPT_FAILED

 #define CURLE_OBSOLETE12 CURLE_FTP_ACCEPT_TIMEOUT

 

@@ -1358,7 +1358,7 @@ typedef enum {
      operation slower and is less friendly for the network. */

   CURLOPT(CURLOPT_FRESH_CONNECT, CURLOPTTYPE_LONG, 74),

 

-  /* Set to explicitly forbid the upcoming transfer's connection to be re-used

+  /* Set to explicitly forbid the upcoming transfer's connection to be reused

      when done. Do not use this unless you're absolutely sure of this, as it

      makes the operation slower and is less friendly for the network. */

   CURLOPT(CURLOPT_FORBID_REUSE, CURLOPTTYPE_LONG, 75),

@@ -1652,7 +1652,7 @@ typedef enum {
   CURLOPT(CURLOPT_SOCKOPTFUNCTION, CURLOPTTYPE_FUNCTIONPOINT, 148),

   CURLOPT(CURLOPT_SOCKOPTDATA, CURLOPTTYPE_CBPOINT, 149),

 

-  /* set to 0 to disable session ID re-use for this transfer, default is

+  /* set to 0 to disable session ID reuse for this transfer, default is

      enabled (== 1) */

   CURLOPT(CURLOPT_SSL_SESSIONID_CACHE, CURLOPTTYPE_LONG, 150),

 

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

+#define LIBCURL_VERSION "8.4.0"

 

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

    defines: */

 #define LIBCURL_VERSION_MAJOR 8

-#define LIBCURL_VERSION_MINOR 3

+#define LIBCURL_VERSION_MINOR 4

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

+#define LIBCURL_VERSION_NUM 0x080400

 

 /*

  * 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-09-13"

+#define LIBCURL_TIMESTAMP "2023-10-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/multi.h b/libs/libcurl/include/curl/multi.h
index caa948953c..9ea91ef7a1 100644
--- a/libs/libcurl/include/curl/multi.h
+++ b/libs/libcurl/include/curl/multi.h
@@ -426,6 +426,17 @@ CURL_EXTERN CURLMcode curl_multi_setopt(CURLM *multi_handle,
 CURL_EXTERN CURLMcode curl_multi_assign(CURLM *multi_handle,

                                         curl_socket_t sockfd, void *sockp);

 

+/*

+ * Name:    curl_multi_get_handles()

+ *

+ * Desc:    Returns an allocated array holding all handles currently added to

+ *          the multi handle. Marks the final entry with a NULL pointer. If

+ *          there is no easy handle added to the multi handle, this function

+ *          returns an array with the first entry as a NULL pointer.

+ *

+ * Returns: NULL on failure, otherwise a CURL **array pointer

+ */

+CURL_EXTERN CURL **curl_multi_get_handles(CURLM *multi_handle);

 

 /*

  * Name: curl_push_callback