libcurl: update to 8.2.0

5 files changed, 41 insertions, 37 deletions

diff --git a/libs/libcurl/include/curl/curl.h b/libs/libcurl/include/curl/curl.h
index 608ff6efc5..b6cc8e8795 100644
--- a/libs/libcurl/include/curl/curl.h
+++ b/libs/libcurl/include/curl/curl.h
@@ -93,7 +93,7 @@
     defined(__CYGWIN__) || defined(AMIGA) || defined(__NuttX__) || \

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

    (defined(__MidnightBSD_version) && (__MidnightBSD_version < 100000)) || \

-    defined(__sun__) || defined(__serenity__)

+    defined(__sun__) || defined(__serenity__) || defined(__vxworks__)

 #include <sys/select.h>

 #endif

 

@@ -781,7 +781,7 @@ typedef enum {
   CURLPROXY_HTTP_1_0 = 1,   /* added in 7.19.4, force to use CONNECT

                                HTTP/1.0  */

   CURLPROXY_HTTPS = 2,  /* HTTPS but stick to HTTP/1 added in 7.52.0 */

-  CURLPROXY_HTTPS2 = 3, /* HTTPS and attempt HTTP/2 added in 8.1.0 */

+  CURLPROXY_HTTPS2 = 3, /* HTTPS and attempt HTTP/2 added in 8.2.0 */

   CURLPROXY_SOCKS4 = 4, /* support added in 7.15.2, enum existed already

                            in 7.10 */

   CURLPROXY_SOCKS5 = 5, /* added in 7.10 */

@@ -2113,7 +2113,7 @@ typedef enum {
   CURLOPT(CURLOPT_SASL_AUTHZID, CURLOPTTYPE_STRINGPOINT, 289),

 

   /* allow RCPT TO command to fail for some recipients */

-  CURLOPT(CURLOPT_MAIL_RCPT_ALLLOWFAILS, CURLOPTTYPE_LONG, 290),

+  CURLOPT(CURLOPT_MAIL_RCPT_ALLOWFAILS, CURLOPTTYPE_LONG, 290),

 

   /* the private SSL-certificate as a "blob" */

   CURLOPT(CURLOPT_SSLCERT_BLOB, CURLOPTTYPE_BLOB, 291),

@@ -2207,6 +2207,9 @@ typedef enum {
   /* Can leak things, gonna exit() soon */

   CURLOPT(CURLOPT_QUICK_EXIT, CURLOPTTYPE_LONG, 322),

 

+  /* set a specific client IP for HAProxy PROXY protocol header? */

+  CURLOPT(CURLOPT_HAPROXY_CLIENT_IP, CURLOPTTYPE_STRINGPOINT, 323),

+

   CURLOPT_LASTENTRY /* the last unused */

 } CURLoption;

 

@@ -2235,6 +2238,9 @@ typedef enum {
 /* */

 #define CURLOPT_FTP_RESPONSE_TIMEOUT CURLOPT_SERVER_RESPONSE_TIMEOUT

 

+/* Added in 8.2.0 */

+#define CURLOPT_MAIL_RCPT_ALLLOWFAILS CURLOPT_MAIL_RCPT_ALLOWFAILS

+

 #else

 /* This is set if CURL_NO_OLDIES is defined at compile-time */

 #undef CURLOPT_DNS_USE_GLOBAL_CACHE /* soon obsolete */

@@ -2918,7 +2924,9 @@ typedef enum {
   CURLINFO_REFERER          = CURLINFO_STRING + 60,

   CURLINFO_CAINFO           = CURLINFO_STRING + 61,

   CURLINFO_CAPATH           = CURLINFO_STRING + 62,

-  CURLINFO_LASTONE          = 62

+  CURLINFO_XFER_ID          = CURLINFO_OFF_T + 63,

+  CURLINFO_CONN_ID          = CURLINFO_OFF_T + 64,

+  CURLINFO_LASTONE          = 64

 } CURLINFO;

 

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

diff --git a/libs/libcurl/include/curl/curlver.h b/libs/libcurl/include/curl/curlver.h
index 8b2d773a6c..a71880e44e 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.1.2"

+#define LIBCURL_VERSION "8.2.0"

 

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

    defines: */

 #define LIBCURL_VERSION_MAJOR 8

-#define LIBCURL_VERSION_MINOR 1

-#define LIBCURL_VERSION_PATCH 2

+#define LIBCURL_VERSION_MINOR 2

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

+#define LIBCURL_VERSION_NUM 0x080200

 

 /*

  * 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-05-30"

+#define LIBCURL_TIMESTAMP "2023-07-19"

 

 #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 990cd9ff1f..556ffa9c9b 100644
--- a/libs/libcurl/include/curl/system.h
+++ b/libs/libcurl/include/curl/system.h
@@ -237,33 +237,28 @@
 #  define CURL_PULL_SYS_SOCKET_H     1

 

 #elif defined(__MVS__)

-#  if defined(__IBMC__) || defined(__IBMCPP__)

-#    if defined(_ILP32)

-#    elif defined(_LP64)

-#    endif

-#    if defined(_LONG_LONG)

-#      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(_LP64)

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

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

+#  if defined(_LONG_LONG)

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

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

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

 

 #elif defined(__370__)

 #  if defined(__IBMC__) || defined(__IBMCPP__)

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

    (option) == CURLOPT_FTPPORT ||                                             \

    (option) == CURLOPT_HSTS ||                                                \

+   (option) == CURLOPT_HAPROXY_CLIENT_IP ||                                   \

    (option) == CURLOPT_INTERFACE ||                                           \

    (option) == CURLOPT_ISSUERCERT ||                                          \

    (option) == CURLOPT_KEYPASSWD ||                                           \

diff --git a/libs/libcurl/include/curl/websockets.h b/libs/libcurl/include/curl/websockets.h
index d6c2e47381..774e85a4cf 100644
--- a/libs/libcurl/include/curl/websockets.h
+++ b/libs/libcurl/include/curl/websockets.h
@@ -54,7 +54,7 @@ struct curl_ws_frame {
  */

 CURL_EXTERN CURLcode curl_ws_recv(CURL *curl, void *buffer, size_t buflen,

                                   size_t *recv,

-                                  struct curl_ws_frame **metap);

+                                  const struct curl_ws_frame **metap);

 

 /* sendflags for curl_ws_send() */

 #define CURLWS_PONG       (1<<6)

@@ -75,7 +75,7 @@ CURL_EXTERN CURLcode curl_ws_send(CURL *curl, const void *buffer,
 /* bits for the CURLOPT_WS_OPTIONS bitmask: */

 #define CURLWS_RAW_MODE (1<<0)

 

-CURL_EXTERN struct curl_ws_frame *curl_ws_meta(CURL *curl);

+CURL_EXTERN const struct curl_ws_frame *curl_ws_meta(CURL *curl);

 

 #ifdef  __cplusplus

 }