libcurl: update to 7.88.0

13 files changed, 41 insertions, 36 deletions

diff --git a/libs/libcurl/include/README.md b/libs/libcurl/include/README.md
index a3239763fa..23f798eddc 100644
--- a/libs/libcurl/include/README.md
+++ b/libs/libcurl/include/README.md
@@ -1,5 +1,5 @@
 <!--

-Copyright (C) 2000 - 2022 Daniel Stenberg, <daniel@haxx.se>, et al.

+Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.

 

 SPDX-License-Identifier: curl

 -->

diff --git a/libs/libcurl/include/curl/curl.h b/libs/libcurl/include/curl/curl.h
index 230b0b93f7..556a88deeb 100644
--- a/libs/libcurl/include/curl/curl.h
+++ b/libs/libcurl/include/curl/curl.h
@@ -7,7 +7,7 @@
  *                            | (__| |_| |  _ <| |___

  *                             \___|\___/|_| \_\_____|

  *

- * Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al.

+ * Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.

  *

  * This software is licensed as described in the file COPYING, which

  * you should have received as part of this distribution. The terms

@@ -167,7 +167,7 @@ typedef enum {
   CURLSSLBACKEND_SECURETRANSPORT = 9,

   CURLSSLBACKEND_AXTLS                  CURL_DEPRECATED(7.61.0, "") = 10,

   CURLSSLBACKEND_MBEDTLS = 11,

-  CURLSSLBACKEND_MESALINK = 12,

+  CURLSSLBACKEND_MESALINK               CURL_DEPRECATED(7.82.0, "") = 12,

   CURLSSLBACKEND_BEARSSL = 13,

   CURLSSLBACKEND_RUSTLS = 14

 } curl_sslbackend;

@@ -248,7 +248,7 @@ typedef int (*curl_xferinfo_callback)(void *clientp,
 

 #ifndef CURL_MAX_READ_SIZE

   /* The maximum receive buffer size configurable via CURLOPT_BUFFERSIZE. */

-#define CURL_MAX_READ_SIZE 524288

+#define CURL_MAX_READ_SIZE (10*1024*1024)

 #endif

 

 #ifndef CURL_MAX_WRITE_SIZE

@@ -2259,8 +2259,13 @@ enum {
   CURL_HTTP_VERSION_2TLS, /* use version 2 for HTTPS, version 1.1 for HTTP */

   CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE,  /* please use HTTP 2 without HTTP/1.1

                                            Upgrade */

-  CURL_HTTP_VERSION_3 = 30, /* Makes use of explicit HTTP/3 without fallback.

-                               Use CURLOPT_ALTSVC to enable HTTP/3 upgrade */

+  CURL_HTTP_VERSION_3 = 30, /* Use HTTP/3, fallback to HTTP/2 or HTTP/1 if

+                               needed. For HTTPS only. For HTTP, this option

+                               makes libcurl return error. */

+  CURL_HTTP_VERSION_3ONLY = 31, /* Use HTTP/3 without fallback. For HTTPS

+                                   only. For HTTP, this makes libcurl

+                                   return error. */

+

   CURL_HTTP_VERSION_LAST /* *ILLEGAL* http version */

 };

 

@@ -2953,6 +2958,7 @@ typedef enum {
   CURL_LOCK_DATA_SSL_SESSION,

   CURL_LOCK_DATA_CONNECT,

   CURL_LOCK_DATA_PSL,

+  CURL_LOCK_DATA_HSTS,

   CURL_LOCK_DATA_LAST

 } curl_lock_data;

 

diff --git a/libs/libcurl/include/curl/curlver.h b/libs/libcurl/include/curl/curlver.h
index 7442e04ab7..4c8d38c59c 100644
--- a/libs/libcurl/include/curl/curlver.h
+++ b/libs/libcurl/include/curl/curlver.h
@@ -7,7 +7,7 @@
  *                            | (__| |_| |  _ <| |___

  *                             \___|\___/|_| \_\_____|

  *

- * Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al.

+ * Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.

  *

  * This software is licensed as described in the file COPYING, which

  * you should have received as part of this distribution. The terms

@@ -28,16 +28,16 @@
    a script at release-time. This was made its own header file in 7.11.2 */

 

 /* This is the global package copyright */

-#define LIBCURL_COPYRIGHT "1996 - 2022 Daniel Stenberg, <daniel@haxx.se>."

+#define LIBCURL_COPYRIGHT "Daniel Stenberg, <daniel@haxx.se>."

 

 /* This is the version number of the libcurl package from which this header

    file origins: */

-#define LIBCURL_VERSION "7.87.0"

+#define LIBCURL_VERSION "7.88.0"

 

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

    defines: */

 #define LIBCURL_VERSION_MAJOR 7

-#define LIBCURL_VERSION_MINOR 87

+#define LIBCURL_VERSION_MINOR 88

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

+#define LIBCURL_VERSION_NUM 0x075800

 

 /*

  * This is the date and time when the full source package was created. The

@@ -70,7 +70,7 @@
  *

  * "2007-11-23"

  */

-#define LIBCURL_TIMESTAMP "2022-12-21"

+#define LIBCURL_TIMESTAMP "2023-02-15"

 

 #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/easy.h b/libs/libcurl/include/curl/easy.h
index 435115cc2f..566668ef3c 100644
--- a/libs/libcurl/include/curl/easy.h
+++ b/libs/libcurl/include/curl/easy.h
@@ -7,7 +7,7 @@
  *                            | (__| |_| |  _ <| |___

  *                             \___|\___/|_| \_\_____|

  *

- * Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al.

+ * Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.

  *

  * This software is licensed as described in the file COPYING, which

  * you should have received as part of this distribution. The terms

diff --git a/libs/libcurl/include/curl/header.h b/libs/libcurl/include/curl/header.h
index 478ab5036b..26ed5691f5 100644
--- a/libs/libcurl/include/curl/header.h
+++ b/libs/libcurl/include/curl/header.h
@@ -7,7 +7,7 @@
  *                            | (__| |_| |  _ <| |___

  *                             \___|\___/|_| \_\_____|

  *

- * Copyright (C) 2018 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al.

+ * Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.

  *

  * This software is licensed as described in the file COPYING, which

  * you should have received as part of this distribution. The terms

diff --git a/libs/libcurl/include/curl/mprintf.h b/libs/libcurl/include/curl/mprintf.h
index 400cde576b..93be4e1f62 100644
--- a/libs/libcurl/include/curl/mprintf.h
+++ b/libs/libcurl/include/curl/mprintf.h
@@ -7,7 +7,7 @@
  *                            | (__| |_| |  _ <| |___

  *                             \___|\___/|_| \_\_____|

  *

- * Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al.

+ * Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.

  *

  * This software is licensed as described in the file COPYING, which

  * you should have received as part of this distribution. The terms

diff --git a/libs/libcurl/include/curl/multi.h b/libs/libcurl/include/curl/multi.h
index 2c01f47697..7a7a1ec229 100644
--- a/libs/libcurl/include/curl/multi.h
+++ b/libs/libcurl/include/curl/multi.h
@@ -7,7 +7,7 @@
  *                            | (__| |_| |  _ <| |___

  *                             \___|\___/|_| \_\_____|

  *

- * Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al.

+ * Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.

  *

  * This software is licensed as described in the file COPYING, which

  * you should have received as part of this distribution. The terms

diff --git a/libs/libcurl/include/curl/options.h b/libs/libcurl/include/curl/options.h
index 83b2b59810..5ba7056400 100644
--- a/libs/libcurl/include/curl/options.h
+++ b/libs/libcurl/include/curl/options.h
@@ -7,7 +7,7 @@
  *                            | (__| |_| |  _ <| |___

  *                             \___|\___/|_| \_\_____|

  *

- * Copyright (C) 2018 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al.

+ * Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.

  *

  * This software is licensed as described in the file COPYING, which

  * you should have received as part of this distribution. The terms

diff --git a/libs/libcurl/include/curl/stdcheaders.h b/libs/libcurl/include/curl/stdcheaders.h
index 6bdf922d37..c64be1657d 100644
--- a/libs/libcurl/include/curl/stdcheaders.h
+++ b/libs/libcurl/include/curl/stdcheaders.h
@@ -7,7 +7,7 @@
  *                            | (__| |_| |  _ <| |___

  *                             \___|\___/|_| \_\_____|

  *

- * Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al.

+ * Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.

  *

  * This software is licensed as described in the file COPYING, which

  * you should have received as part of this distribution. The terms

diff --git a/libs/libcurl/include/curl/system.h b/libs/libcurl/include/curl/system.h
index 4c31d486c5..990cd9ff1f 100644
--- a/libs/libcurl/include/curl/system.h
+++ b/libs/libcurl/include/curl/system.h
@@ -7,7 +7,7 @@
  *                            | (__| |_| |  _ <| |___

  *                             \___|\___/|_| \_\_____|

  *

- * Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al.

+ * Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.

  *

  * This software is licensed as described in the file COPYING, which

  * you should have received as part of this distribution. The terms

@@ -227,16 +227,14 @@
 #  define CURL_TYPEOF_CURL_SOCKLEN_T unsigned int

 

 #elif defined(__OS400__)

-#  if defined(__ILEC400__)

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

-#    define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t

-#    define CURL_PULL_SYS_TYPES_H      1

-#    define CURL_PULL_SYS_SOCKET_H     1

-#  endif

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

+#  define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t

+#  define CURL_PULL_SYS_TYPES_H      1

+#  define CURL_PULL_SYS_SOCKET_H     1

 

 #elif defined(__MVS__)

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

diff --git a/libs/libcurl/include/curl/typecheck-gcc.h b/libs/libcurl/include/curl/typecheck-gcc.h
index a23e0f8602..a67a9145c3 100644
--- a/libs/libcurl/include/curl/typecheck-gcc.h
+++ b/libs/libcurl/include/curl/typecheck-gcc.h
@@ -7,7 +7,7 @@
  *                            | (__| |_| |  _ <| |___

  *                             \___|\___/|_| \_\_____|

  *

- * Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al.

+ * Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.

  *

  * This software is licensed as described in the file COPYING, which

  * you should have received as part of this distribution. The terms

@@ -42,9 +42,8 @@
  */

 #define curl_easy_setopt(handle, option, value)                         \

   __extension__({                                                       \

-      CURL_IGNORE_DEPRECATION(__typeof__(option) _curl_opt = option;)   \

+      CURLoption _curl_opt = (option);                                  \

       if(__builtin_constant_p(_curl_opt)) {                             \

-        (void) option;                                                  \

         CURL_IGNORE_DEPRECATION(                                        \

           if(curlcheck_long_option(_curl_opt))                          \

             if(!curlcheck_long(value))                                  \

@@ -120,9 +119,8 @@
 /* wraps curl_easy_getinfo() with typechecking */

 #define curl_easy_getinfo(handle, info, arg)                            \

   __extension__({                                                       \

-      CURL_IGNORE_DEPRECATION(__typeof__(info) _curl_info = info;)      \

+      CURLINFO _curl_info = (info);                                     \

       if(__builtin_constant_p(_curl_info)) {                            \

-        (void) info;                                                    \

         CURL_IGNORE_DEPRECATION(                                        \

           if(curlcheck_string_info(_curl_info))                         \

             if(!curlcheck_arr((arg), char *))                           \

diff --git a/libs/libcurl/include/curl/urlapi.h b/libs/libcurl/include/curl/urlapi.h
index 76ebc95755..a65e7f4692 100644
--- a/libs/libcurl/include/curl/urlapi.h
+++ b/libs/libcurl/include/curl/urlapi.h
@@ -7,7 +7,7 @@
  *                            | (__| |_| |  _ <| |___

  *                             \___|\___/|_| \_\_____|

  *

- * Copyright (C) 2018 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al.

+ * Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.

  *

  * This software is licensed as described in the file COPYING, which

  * you should have received as part of this distribution. The terms

@@ -62,6 +62,7 @@ typedef enum {
   CURLUE_BAD_SCHEME,          /* 27 */

   CURLUE_BAD_SLASHES,         /* 28 */

   CURLUE_BAD_USER,            /* 29 */

+  CURLUE_LACKS_IDN,           /* 30 */

   CURLUE_LAST

 } CURLUcode;

 

@@ -95,6 +96,7 @@ 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 */

 

 typedef struct Curl_URL CURLU;

 

diff --git a/libs/libcurl/include/curl/websockets.h b/libs/libcurl/include/curl/websockets.h
index 5d6b3bf050..d6c2e47381 100644
--- a/libs/libcurl/include/curl/websockets.h
+++ b/libs/libcurl/include/curl/websockets.h
@@ -7,7 +7,7 @@
  *                            | (__| |_| |  _ <| |___

  *                             \___|\___/|_| \_\_____|

  *

- * Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al.

+ * Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.

  *

  * This software is licensed as described in the file COPYING, which

  * you should have received as part of this distribution. The terms

@@ -33,6 +33,7 @@ struct curl_ws_frame {
   int flags;            /* See the CURLWS_* defines */

   curl_off_t offset;    /* the offset of this data into the frame */

   curl_off_t bytesleft; /* number of pending bytes left of the payload */

+  size_t len;           /* size of the current data chunk */

 };

 

 /* flag bits */