libcurl: update to 8.5.0

3 files changed, 24 insertions, 47 deletions

diff --git a/libs/libcurl/include/curl/curl.h b/libs/libcurl/include/curl/curl.h
index 05c90b7ce3..1f6c5764c6 100644
--- a/libs/libcurl/include/curl/curl.h
+++ b/libs/libcurl/include/curl/curl.h
@@ -53,28 +53,19 @@
 #include "curlver.h"         /* libcurl version defines   */

 #include "system.h"          /* determine things run-time */

 

-/*

- * Define CURL_WIN32 when build target is Win32 API

- */

-

-#if (defined(_WIN32) || defined(__WIN32__) || defined(WIN32)) &&        \

-  !defined(__SYMBIAN32__)

-#define CURL_WIN32

-#endif

-

 #include <stdio.h>

 #include <limits.h>

 

-#if (defined(__FreeBSD__) && (__FreeBSD__ >= 2)) || defined(__MidnightBSD__)

+#if defined(__FreeBSD__) || defined(__MidnightBSD__)

 /* Needed for __FreeBSD_version or __MidnightBSD_version symbol definition */

-#include <osreldate.h>

+#include <sys/param.h>

 #endif

 

 /* The include stuff here below is mainly for time_t! */

 #include <sys/types.h>

 #include <time.h>

 

-#if defined(CURL_WIN32) && !defined(_WIN32_WCE) && !defined(__CYGWIN__)

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

@@ -88,7 +79,7 @@
    libc5-based Linux systems. Only include it on systems that are known to

    require it! */

 #if defined(_AIX) || defined(__NOVELL_LIBC__) || defined(__NetBSD__) || \

-    defined(__minix) || defined(__SYMBIAN32__) || defined(__INTEGRITY) || \

+    defined(__minix) || defined(__INTEGRITY) || \

     defined(ANDROID) || defined(__ANDROID__) || defined(__OpenBSD__) || \

     defined(__CYGWIN__) || defined(AMIGA) || defined(__NuttX__) || \

    (defined(__FreeBSD_version) && (__FreeBSD_version < 800000)) || \

@@ -97,11 +88,11 @@
 #include <sys/select.h>

 #endif

 

-#if !defined(CURL_WIN32) && !defined(_WIN32_WCE)

+#if !defined(_WIN32) && !defined(_WIN32_WCE)

 #include <sys/socket.h>

 #endif

 

-#if !defined(CURL_WIN32)

+#if !defined(_WIN32)

 #include <sys/time.h>

 #endif

 

@@ -128,7 +119,7 @@ typedef void CURLSH;
 

 #ifdef CURL_STATICLIB

 #  define CURL_EXTERN

-#elif defined(CURL_WIN32) || defined(__SYMBIAN32__) || \

+#elif defined(_WIN32) || \

      (__has_declspec_attribute(dllexport) && \

       __has_declspec_attribute(dllimport))

 #  if defined(BUILDING_LIBCURL)

@@ -144,7 +135,7 @@ typedef void CURLSH;
 

 #ifndef curl_socket_typedef

 /* socket typedef */

-#if defined(CURL_WIN32) && !defined(__LWIP_OPT_H__) && !defined(LWIP_HDR_OPT_H)

+#if defined(_WIN32) && !defined(__LWIP_OPT_H__) && !defined(LWIP_HDR_OPT_H)

 typedef SOCKET curl_socket_t;

 #define CURL_SOCKET_BAD INVALID_SOCKET

 #else

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

 #include "header.h"

 #include "websockets.h"

+#include "mprintf.h"

 

 /* the typechecker doesn't 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 7d64b35c92..e54a5e6138 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.4.0"

+#define LIBCURL_VERSION "8.5.0"

 

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

    defines: */

 #define LIBCURL_VERSION_MAJOR 8

-#define LIBCURL_VERSION_MINOR 4

+#define LIBCURL_VERSION_MINOR 5

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

+#define LIBCURL_VERSION_NUM 0x080500

 

 /*

  * 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-10-11"

+#define LIBCURL_TIMESTAMP "2023-12-06"

 

 #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/system.h b/libs/libcurl/include/curl/system.h
index 9a32e26d63..40044a4ee3 100644
--- a/libs/libcurl/include/curl/system.h
+++ b/libs/libcurl/include/curl/system.h
@@ -141,29 +141,6 @@
 #    define CURL_TYPEOF_CURL_SOCKLEN_T int

 #  endif

 

-#elif defined(__SYMBIAN32__)

-#  if defined(__EABI__) /* Treat all ARM compilers equally */

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

-#  elif defined(__CW32__)

-#    pragma longlong on

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

-#  elif defined(__VC32__)

-#    define CURL_TYPEOF_CURL_OFF_T     __int64

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

-#  endif

-#  define CURL_TYPEOF_CURL_SOCKLEN_T unsigned int

-

 #elif defined(macintosh)

 #  include <ConditionalMacros.h>

 #  if TYPE_LONGLONG

@@ -201,9 +178,10 @@
 #  define CURL_TYPEOF_CURL_SOCKLEN_T int

 

 #elif defined(__MINGW32__)

+#  include <inttypes.h>

 #  define CURL_TYPEOF_CURL_OFF_T     long long

-#  define CURL_FORMAT_CURL_OFF_T     "I64d"

-#  define CURL_FORMAT_CURL_OFF_TU    "I64u"

+#  define CURL_FORMAT_CURL_OFF_T     PRId64

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

@@ -370,7 +348,14 @@
 /* ===================================== */

 

 #elif defined(_MSC_VER)

-#  if (_MSC_VER >= 900) && (_INTEGRAL_MAX_BITS >= 64)

+#  if (_MSC_VER >= 1800)

+#    include <inttypes.h>

+#    define CURL_TYPEOF_CURL_OFF_T     __int64

+#    define CURL_FORMAT_CURL_OFF_T     PRId64

+#    define CURL_FORMAT_CURL_OFF_TU    PRIu64

+#    define CURL_SUFFIX_CURL_OFF_T     i64

+#    define CURL_SUFFIX_CURL_OFF_TU    ui64

+#  elif (_MSC_VER >= 900) && (_INTEGRAL_MAX_BITS >= 64)

 #    define CURL_TYPEOF_CURL_OFF_T     __int64

 #    define CURL_FORMAT_CURL_OFF_T     "I64d"

 #    define CURL_FORMAT_CURL_OFF_TU    "I64u"