Skip to content

Commit 0cdd46a

Browse files
patrikjuvonenpatrikjuvonen
authored
Update curl from 7.84.0 to 7.85.0 (#2728)
1 parent bd73e60 commit 0cdd46a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+7128
-6227
lines changed

‎vendor/curl/CHANGES‎

Lines changed: 4806 additions & 4477 deletions
Large diffs are not rendered by default.

‎vendor/curl/RELEASE-NOTES‎

Lines changed: 359 additions & 268 deletions
Large diffs are not rendered by default.

‎vendor/curl/include/curl/curl.h‎

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@
7575
defined(ANDROID) || defined(__ANDROID__) || defined(__OpenBSD__) || \
7676
defined(__CYGWIN__) || defined(AMIGA) || defined(__NuttX__) || \
7777
(defined(__FreeBSD_version) && (__FreeBSD_version < 800000)) || \
78-
(defined(__MidnightBSD_version) && (__MidnightBSD_version < 100000))
78+
(defined(__MidnightBSD_version) && (__MidnightBSD_version < 100000)) || \
79+
defined(__sun__)
7980
#include <sys/select.h>
8081
#endif
8182

@@ -577,7 +578,7 @@ typedef enum {
577578
CURLE_TFTP_UNKNOWNID, /* 72 - Unknown transfer ID */
578579
CURLE_REMOTE_FILE_EXISTS, /* 73 - File already exists */
579580
CURLE_TFTP_NOSUCHUSER, /* 74 - No such user */
580-
CURLE_CONV_FAILED, /* 75 - conversion failed */
581+
CURLE_OBSOLETE75, /* 75 - NOT IN USE since 7.82.0 */
581582
CURLE_OBSOLETE76, /* 76 - NOT IN USE since 7.82.0 */
582583
CURLE_SSL_CACERT_BADFILE, /* 77 - could not load CACERT file, missing
583584
or wrong format */
@@ -680,6 +681,7 @@ typedef enum {
680681
#define CURLE_FTP_BAD_DOWNLOAD_RESUME CURLE_BAD_DOWNLOAD_RESUME
681682
#define CURLE_LDAP_INVALID_URL CURLE_OBSOLETE62
682683
#define CURLE_CONV_REQD CURLE_OBSOLETE76
684+
#define CURLE_CONV_FAILED CURLE_OBSOLETE75
683685

684686
/* This was the error code 50 in 7.7.3 and a few earlier versions, this
685687
is no longer used by libcurl but is instead #defined here only to not
@@ -1009,7 +1011,8 @@ typedef CURLSTScode (*curl_hstswrite_callback)(CURL *easy,
10091011
#define CURLHSTS_ENABLE (long)(1<<0)
10101012
#define CURLHSTS_READONLYFILE (long)(1<<1)
10111013

1012-
/* CURLPROTO_ defines are for the CURLOPT_*PROTOCOLS options */
1014+
/* The CURLPROTO_ defines below are for the **deprecated** CURLOPT_*PROTOCOLS
1015+
options. Do not use. */
10131016
#define CURLPROTO_HTTP (1<<0)
10141017
#define CURLPROTO_HTTPS (1<<1)
10151018
#define CURLPROTO_FTP (1<<2)
@@ -1475,12 +1478,11 @@ typedef enum {
14751478
Note that setting multiple bits may cause extra network round-trips. */
14761479
CURLOPT(CURLOPT_PROXYAUTH, CURLOPTTYPE_VALUES, 111),
14771480

1478-
/* FTP option that changes the timeout, in seconds, associated with
1479-
getting a response. This is different from transfer timeout time and
1480-
essentially places a demand on the FTP server to acknowledge commands
1481-
in a timely manner. */
1482-
CURLOPT(CURLOPT_FTP_RESPONSE_TIMEOUT, CURLOPTTYPE_LONG, 112),
1483-
#define CURLOPT_SERVER_RESPONSE_TIMEOUT CURLOPT_FTP_RESPONSE_TIMEOUT
1481+
/* Option that changes the timeout, in seconds, associated with getting a
1482+
response. This is different from transfer timeout time and essentially
1483+
places a demand on the server to acknowledge commands in a timely
1484+
manner. For FTP, SMTP, IMAP and POP3. */
1485+
CURLOPT(CURLOPT_SERVER_RESPONSE_TIMEOUT, CURLOPTTYPE_LONG, 112),
14841486

14851487
/* Set this option to one of the CURL_IPRESOLVE_* defines (see below) to
14861488
tell libcurl to use those IP versions only. This only has effect on
@@ -2143,6 +2145,15 @@ typedef enum {
21432145
/* set the SSH host key callback custom pointer */
21442146
CURLOPT(CURLOPT_SSH_HOSTKEYDATA, CURLOPTTYPE_CBPOINT, 317),
21452147

2148+
/* specify which protocols that are allowed to be used for the transfer,
2149+
which thus helps the app which takes URLs from users or other external
2150+
inputs and want to restrict what protocol(s) to deal with. Defaults to
2151+
all built-in protocols. */
2152+
CURLOPT(CURLOPT_PROTOCOLS_STR, CURLOPTTYPE_STRINGPOINT, 318),
2153+
2154+
/* specify which protocols that libcurl is allowed to follow directs to */
2155+
CURLOPT(CURLOPT_REDIR_PROTOCOLS_STR, CURLOPTTYPE_STRINGPOINT, 319),
2156+
21462157
CURLOPT_LASTENTRY /* the last unused */
21472158
} CURLoption;
21482159

@@ -2168,6 +2179,9 @@ typedef enum {
21682179
#define CURLOPT_SSLCERTPASSWD CURLOPT_KEYPASSWD
21692180
#define CURLOPT_KRB4LEVEL CURLOPT_KRBLEVEL
21702181

2182+
/* */
2183+
#define CURLOPT_FTP_RESPONSE_TIMEOUT CURLOPT_SERVER_RESPONSE_TIMEOUT
2184+
21712185
#else
21722186
/* This is set if CURL_NO_OLDIES is defined at compile-time */
21732187
#undef CURLOPT_DNS_USE_GLOBAL_CACHE /* soon obsolete */
@@ -2182,7 +2196,7 @@ typedef enum {
21822196
#define CURL_IPRESOLVE_V4 1 /* uses only IPv4 addresses/connections */
21832197
#define CURL_IPRESOLVE_V6 2 /* uses only IPv6 addresses/connections */
21842198

2185-
/* three convenient "aliases" that follow the name scheme better */
2199+
/* Convenient "aliases" */
21862200
#define CURLOPT_RTSPHEADER CURLOPT_HTTPHEADER
21872201

21882202
/* These enums are for use with the CURLOPT_HTTP_VERSION option. */

‎vendor/curl/include/curl/curlver.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@
3232

3333
/* This is the version number of the libcurl package from which this header
3434
file origins: */
35-
#define LIBCURL_VERSION "7.84.0"
35+
#define LIBCURL_VERSION "7.85.0"
3636

3737
/* The numeric version number is also available "in parts" by using these
3838
defines: */
3939
#define LIBCURL_VERSION_MAJOR 7
40-
#define LIBCURL_VERSION_MINOR 84
40+
#define LIBCURL_VERSION_MINOR 85
4141
#define LIBCURL_VERSION_PATCH 0
4242

4343
/* This is the numeric version of the libcurl version number, meant for easier
@@ -59,7 +59,7 @@
5959
CURL_VERSION_BITS() macro since curl's own configure script greps for it
6060
and needs it to contain the full number.
6161
*/
62-
#define LIBCURL_VERSION_NUM 0x075400
62+
#define LIBCURL_VERSION_NUM 0x075500
6363

6464
/*
6565
* This is the date and time when the full source package was created. The
@@ -70,7 +70,7 @@
7070
*
7171
* "2007-11-23"
7272
*/
73-
#define LIBCURL_TIMESTAMP "2022-06-27"
73+
#define LIBCURL_TIMESTAMP "2022-08-31"
7474

7575
#define CURL_VERSION_BITS(x,y,z) ((x)<<16|(y)<<8|(z))
7676
#define CURL_AT_LEAST_VERSION(x,y,z) \

‎vendor/curl/include/curl/typecheck-gcc.h‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -272,9 +272,9 @@ CURLWARNING(_curl_easy_getinfo_err_curl_off_t,
272272
(option) == CURLOPT_DNS_SERVERS || \
273273
(option) == CURLOPT_DOH_URL || \
274274
(option) == CURLOPT_EGDSOCKET || \
275-
(option) == CURLOPT_FTPPORT || \
276275
(option) == CURLOPT_FTP_ACCOUNT || \
277276
(option) == CURLOPT_FTP_ALTERNATIVE_TO_USER || \
277+
(option) == CURLOPT_FTPPORT || \
278278
(option) == CURLOPT_HSTS || \
279279
(option) == CURLOPT_INTERFACE || \
280280
(option) == CURLOPT_ISSUERCERT || \
@@ -288,28 +288,30 @@ CURLWARNING(_curl_easy_getinfo_err_curl_off_t,
288288
(option) == CURLOPT_PASSWORD || \
289289
(option) == CURLOPT_PINNEDPUBLICKEY || \
290290
(option) == CURLOPT_PRE_PROXY || \
291+
(option) == CURLOPT_PROTOCOLS_STR || \
291292
(option) == CURLOPT_PROXY || \
292-
(option) == CURLOPT_PROXYPASSWORD || \
293-
(option) == CURLOPT_PROXYUSERNAME || \
294-
(option) == CURLOPT_PROXYUSERPWD || \
295293
(option) == CURLOPT_PROXY_CAINFO || \
296294
(option) == CURLOPT_PROXY_CAPATH || \
297295
(option) == CURLOPT_PROXY_CRLFILE || \
298296
(option) == CURLOPT_PROXY_ISSUERCERT || \
299297
(option) == CURLOPT_PROXY_KEYPASSWD || \
300298
(option) == CURLOPT_PROXY_PINNEDPUBLICKEY || \
301299
(option) == CURLOPT_PROXY_SERVICE_NAME || \
300+
(option) == CURLOPT_PROXY_SSL_CIPHER_LIST || \
302301
(option) == CURLOPT_PROXY_SSLCERT || \
303302
(option) == CURLOPT_PROXY_SSLCERTTYPE || \
304303
(option) == CURLOPT_PROXY_SSLKEY || \
305304
(option) == CURLOPT_PROXY_SSLKEYTYPE || \
306-
(option) == CURLOPT_PROXY_SSL_CIPHER_LIST || \
307305
(option) == CURLOPT_PROXY_TLS13_CIPHERS || \
308306
(option) == CURLOPT_PROXY_TLSAUTH_PASSWORD || \
309307
(option) == CURLOPT_PROXY_TLSAUTH_TYPE || \
310308
(option) == CURLOPT_PROXY_TLSAUTH_USERNAME || \
309+
(option) == CURLOPT_PROXYPASSWORD || \
310+
(option) == CURLOPT_PROXYUSERNAME || \
311+
(option) == CURLOPT_PROXYUSERPWD || \
311312
(option) == CURLOPT_RANDOM_FILE || \
312313
(option) == CURLOPT_RANGE || \
314+
(option) == CURLOPT_REDIR_PROTOCOLS_STR || \
313315
(option) == CURLOPT_REFERER || \
314316
(option) == CURLOPT_REQUEST_TARGET || \
315317
(option) == CURLOPT_RTSP_SESSION_ID || \

0 commit comments

Comments
 (0)