Skip to content

Commit 5a5af36

Browse files
Dutchman101Dutchman101
committed
Update cURL to 8.12.1
1 parent 2cff916 commit 5a5af36

File tree

184 files changed

+7329
-6589
lines changed

Some content is hidden

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

184 files changed

+7329
-6589
lines changed

‎vendor/curl/COPYING

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
COPYRIGHT AND PERMISSION NOTICE
22

3-
Copyright (c) 1996 - 2024, Daniel Stenberg, <[email protected]>, and many
3+
Copyright (c) 1996 - 2025, Daniel Stenberg, <[email protected]>, and many
44
contributors, see the THANKS file.
55

66
All rights reserved.

‎vendor/curl/RELEASE-NOTES

Lines changed: 145 additions & 174 deletions
Large diffs are not rendered by default.

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

Lines changed: 49 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1959,10 +1959,10 @@ typedef enum {
19591959
/* Set stream weight, 1 - 256 (default is 16) */
19601960
CURLOPT(CURLOPT_STREAM_WEIGHT, CURLOPTTYPE_LONG, 239),
19611961

1962-
/* Set stream dependency on another CURL handle */
1962+
/* Set stream dependency on another curl handle */
19631963
CURLOPT(CURLOPT_STREAM_DEPENDS, CURLOPTTYPE_OBJECTPOINT, 240),
19641964

1965-
/* Set E-xclusive stream dependency on another CURL handle */
1965+
/* Set E-xclusive stream dependency on another curl handle */
19661966
CURLOPT(CURLOPT_STREAM_DEPENDS_E, CURLOPTTYPE_OBJECTPOINT, 241),
19671967

19681968
/* Do not send any tftp option requests to the server */
@@ -2959,7 +2959,9 @@ typedef enum {
29592959
CURLINFO_USED_PROXY = CURLINFO_LONG + 66,
29602960
CURLINFO_POSTTRANSFER_TIME_T = CURLINFO_OFF_T + 67,
29612961
CURLINFO_EARLYDATA_SENT_T = CURLINFO_OFF_T + 68,
2962-
CURLINFO_LASTONE = 68
2962+
CURLINFO_HTTPAUTH_USED = CURLINFO_LONG + 69,
2963+
CURLINFO_PROXYAUTH_USED = CURLINFO_LONG + 70,
2964+
CURLINFO_LASTONE = 70
29632965
} CURLINFO;
29642966

29652967
/* CURLINFO_RESPONSE_CODE is the new name for the option previously known as
@@ -3230,6 +3232,50 @@ CURL_EXTERN CURLcode curl_easy_pause(CURL *handle, int bitmask);
32303232
#define CURLPAUSE_ALL (CURLPAUSE_RECV|CURLPAUSE_SEND)
32313233
#define CURLPAUSE_CONT (CURLPAUSE_RECV_CONT|CURLPAUSE_SEND_CONT)
32323234

3235+
/*
3236+
* NAME curl_easy_ssls_import()
3237+
*
3238+
* DESCRIPTION
3239+
*
3240+
* The curl_easy_ssls_import function adds a previously exported SSL session
3241+
* to the SSL session cache of the easy handle (or the underlying share).
3242+
*/
3243+
CURL_EXTERN CURLcode curl_easy_ssls_import(CURL *handle,
3244+
const char *session_key,
3245+
const unsigned char *shmac,
3246+
size_t shmac_len,
3247+
const unsigned char *sdata,
3248+
size_t sdata_len);
3249+
3250+
/* This is the curl_ssls_export_cb callback prototype. It
3251+
* is passed to curl_easy_ssls_export() to extract SSL sessions/tickets. */
3252+
typedef CURLcode curl_ssls_export_cb(CURL *handle,
3253+
void *userptr,
3254+
const char *session_key,
3255+
const unsigned char *shmac,
3256+
size_t shmac_len,
3257+
const unsigned char *sdata,
3258+
size_t sdata_len,
3259+
curl_off_t valid_until,
3260+
int ietf_tls_id,
3261+
const char *alpn,
3262+
size_t earlydata_max);
3263+
3264+
/*
3265+
* NAME curl_easy_ssls_export()
3266+
*
3267+
* DESCRIPTION
3268+
*
3269+
* The curl_easy_ssls_export function iterates over all SSL sessions stored
3270+
* in the easy handle (or underlying share) and invokes the passed
3271+
* callback.
3272+
*
3273+
*/
3274+
CURL_EXTERN CURLcode curl_easy_ssls_export(CURL *handle,
3275+
curl_ssls_export_cb *export_fn,
3276+
void *userptr);
3277+
3278+
32333279
#ifdef __cplusplus
32343280
} /* end of extern "C" */
32353281
#endif

‎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 "8.11.1"
35+
#define LIBCURL_VERSION "8.12.1"
3636

3737
/* The numeric version number is also available "in parts" by using these
3838
defines: */
3939
#define LIBCURL_VERSION_MAJOR 8
40-
#define LIBCURL_VERSION_MINOR 11
40+
#define LIBCURL_VERSION_MINOR 12
4141
#define LIBCURL_VERSION_PATCH 1
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 0x080b01
62+
#define LIBCURL_VERSION_NUM 0x080c01
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 "2024-12-11"
73+
#define LIBCURL_TIMESTAMP "2025-02-13"
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/easy.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ CURL_EXTERN CURL *curl_easy_duphandle(CURL *curl);
7878
*
7979
* DESCRIPTION
8080
*
81-
* Re-initializes a CURL handle to the default values. This puts back the
81+
* Re-initializes a curl handle to the default values. This puts back the
8282
* handle to the same state as it was in when it was just created.
8383
*
8484
* It does keep: live connections, the Session ID cache, the DNS cache and the

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

Lines changed: 40 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -52,62 +52,24 @@
5252
*
5353
*/
5454

55-
#if defined(__DJGPP__) || defined(__GO32__)
56-
# if defined(__DJGPP__) && (__DJGPP__ > 1)
57-
# define CURL_TYPEOF_CURL_OFF_T long long
58-
# define CURL_FORMAT_CURL_OFF_T "lld"
59-
# define CURL_FORMAT_CURL_OFF_TU "llu"
60-
# define CURL_SUFFIX_CURL_OFF_T LL
61-
# define CURL_SUFFIX_CURL_OFF_TU ULL
62-
# else
63-
# define CURL_TYPEOF_CURL_OFF_T long
64-
# define CURL_FORMAT_CURL_OFF_T "ld"
65-
# define CURL_FORMAT_CURL_OFF_TU "lu"
66-
# define CURL_SUFFIX_CURL_OFF_T L
67-
# define CURL_SUFFIX_CURL_OFF_TU UL
68-
# endif
69-
# define CURL_TYPEOF_CURL_SOCKLEN_T int
70-
71-
#elif defined(__SALFORDC__)
72-
# define CURL_TYPEOF_CURL_OFF_T long
73-
# define CURL_FORMAT_CURL_OFF_T "ld"
74-
# define CURL_FORMAT_CURL_OFF_TU "lu"
75-
# define CURL_SUFFIX_CURL_OFF_T L
76-
# define CURL_SUFFIX_CURL_OFF_TU UL
55+
#if defined(__DJGPP__)
56+
# define CURL_TYPEOF_CURL_OFF_T long long
57+
# define CURL_FORMAT_CURL_OFF_T "lld"
58+
# define CURL_FORMAT_CURL_OFF_TU "llu"
59+
# define CURL_SUFFIX_CURL_OFF_T LL
60+
# define CURL_SUFFIX_CURL_OFF_TU ULL
7761
# define CURL_TYPEOF_CURL_SOCKLEN_T int
7862

7963
#elif defined(__BORLANDC__)
80-
# if (__BORLANDC__ < 0x520)
81-
# define CURL_TYPEOF_CURL_OFF_T long
82-
# define CURL_FORMAT_CURL_OFF_T "ld"
83-
# define CURL_FORMAT_CURL_OFF_TU "lu"
84-
# define CURL_SUFFIX_CURL_OFF_T L
85-
# define CURL_SUFFIX_CURL_OFF_TU UL
86-
# else
87-
# define CURL_TYPEOF_CURL_OFF_T __int64
88-
# define CURL_FORMAT_CURL_OFF_T "I64d"
89-
# define CURL_FORMAT_CURL_OFF_TU "I64u"
90-
# define CURL_SUFFIX_CURL_OFF_T i64
91-
# define CURL_SUFFIX_CURL_OFF_TU ui64
92-
# endif
93-
# define CURL_TYPEOF_CURL_SOCKLEN_T int
94-
95-
#elif defined(__TURBOC__)
96-
# define CURL_TYPEOF_CURL_OFF_T long
97-
# define CURL_FORMAT_CURL_OFF_T "ld"
98-
# define CURL_FORMAT_CURL_OFF_TU "lu"
99-
# define CURL_SUFFIX_CURL_OFF_T L
100-
# define CURL_SUFFIX_CURL_OFF_TU UL
64+
# define CURL_TYPEOF_CURL_OFF_T __int64
65+
# define CURL_FORMAT_CURL_OFF_T "I64d"
66+
# define CURL_FORMAT_CURL_OFF_TU "I64u"
67+
# define CURL_SUFFIX_CURL_OFF_T i64
68+
# define CURL_SUFFIX_CURL_OFF_TU ui64
10169
# define CURL_TYPEOF_CURL_SOCKLEN_T int
10270

10371
#elif defined(__POCC__)
104-
# if (__POCC__ < 280)
105-
# define CURL_TYPEOF_CURL_OFF_T long
106-
# define CURL_FORMAT_CURL_OFF_T "ld"
107-
# define CURL_FORMAT_CURL_OFF_TU "lu"
108-
# define CURL_SUFFIX_CURL_OFF_T L
109-
# define CURL_SUFFIX_CURL_OFF_TU UL
110-
# elif defined(_MSC_VER)
72+
# if defined(_MSC_VER)
11173
# define CURL_TYPEOF_CURL_OFF_T __int64
11274
# define CURL_FORMAT_CURL_OFF_T "I64d"
11375
# define CURL_FORMAT_CURL_OFF_TU "I64u"
@@ -159,15 +121,21 @@
159121
# define CURL_TYPEOF_CURL_SOCKLEN_T unsigned int
160122

161123
#elif defined(__TANDEM)
162-
# if ! defined(__LP64)
163-
/* Required for 32-bit NonStop builds only. */
164-
# define CURL_TYPEOF_CURL_OFF_T long long
165-
# define CURL_FORMAT_CURL_OFF_T "lld"
166-
# define CURL_FORMAT_CURL_OFF_TU "llu"
167-
# define CURL_SUFFIX_CURL_OFF_T LL
168-
# define CURL_SUFFIX_CURL_OFF_TU ULL
169-
# define CURL_TYPEOF_CURL_SOCKLEN_T int
170-
# endif
124+
# if !defined(__LP64)
125+
# define CURL_TYPEOF_CURL_OFF_T long long
126+
# define CURL_FORMAT_CURL_OFF_T "lld"
127+
# define CURL_FORMAT_CURL_OFF_TU "llu"
128+
# define CURL_SUFFIX_CURL_OFF_T LL
129+
# define CURL_SUFFIX_CURL_OFF_TU ULL
130+
# define CURL_TYPEOF_CURL_SOCKLEN_T int
131+
# else
132+
# define CURL_TYPEOF_CURL_OFF_T long
133+
# define CURL_FORMAT_CURL_OFF_T "ld"
134+
# define CURL_FORMAT_CURL_OFF_TU "lu"
135+
# define CURL_SUFFIX_CURL_OFF_T L
136+
# define CURL_SUFFIX_CURL_OFF_TU UL
137+
# define CURL_TYPEOF_CURL_SOCKLEN_T unsigned int
138+
# endif
171139

172140
#elif defined(_WIN32_WCE)
173141
# define CURL_TYPEOF_CURL_OFF_T __int64
@@ -220,13 +188,7 @@
220188
# define CURL_FORMAT_CURL_OFF_TU "llu"
221189
# define CURL_SUFFIX_CURL_OFF_T LL
222190
# define CURL_SUFFIX_CURL_OFF_TU ULL
223-
# elif defined(_LP64)
224-
# define CURL_TYPEOF_CURL_OFF_T long
225-
# define CURL_FORMAT_CURL_OFF_T "ld"
226-
# define CURL_FORMAT_CURL_OFF_TU "lu"
227-
# define CURL_SUFFIX_CURL_OFF_T L
228-
# define CURL_SUFFIX_CURL_OFF_TU UL
229-
# else
191+
# else /* _LP64 and default */
230192
# define CURL_TYPEOF_CURL_OFF_T long
231193
# define CURL_FORMAT_CURL_OFF_T "ld"
232194
# define CURL_FORMAT_CURL_OFF_TU "lu"
@@ -239,22 +201,13 @@
239201

240202
#elif defined(__370__)
241203
# if defined(__IBMC__) || defined(__IBMCPP__)
242-
# if defined(_ILP32)
243-
# elif defined(_LP64)
244-
# endif
245204
# if defined(_LONG_LONG)
246205
# define CURL_TYPEOF_CURL_OFF_T long long
247206
# define CURL_FORMAT_CURL_OFF_T "lld"
248207
# define CURL_FORMAT_CURL_OFF_TU "llu"
249208
# define CURL_SUFFIX_CURL_OFF_T LL
250209
# define CURL_SUFFIX_CURL_OFF_TU ULL
251-
# elif defined(_LP64)
252-
# define CURL_TYPEOF_CURL_OFF_T long
253-
# define CURL_FORMAT_CURL_OFF_T "ld"
254-
# define CURL_FORMAT_CURL_OFF_TU "lu"
255-
# define CURL_SUFFIX_CURL_OFF_T L
256-
# define CURL_SUFFIX_CURL_OFF_TU UL
257-
# else
210+
# else /* _LP64 and default */
258211
# define CURL_TYPEOF_CURL_OFF_T long
259212
# define CURL_FORMAT_CURL_OFF_T "ld"
260213
# define CURL_FORMAT_CURL_OFF_TU "lu"
@@ -349,24 +302,15 @@
349302
#elif defined(_MSC_VER)
350303
# if (_MSC_VER >= 1800)
351304
# include <inttypes.h>
352-
# define CURL_TYPEOF_CURL_OFF_T __int64
353305
# define CURL_FORMAT_CURL_OFF_T PRId64
354306
# define CURL_FORMAT_CURL_OFF_TU PRIu64
355-
# define CURL_SUFFIX_CURL_OFF_T i64
356-
# define CURL_SUFFIX_CURL_OFF_TU ui64
357-
# elif (_MSC_VER >= 900) && (_INTEGRAL_MAX_BITS >= 64)
358-
# define CURL_TYPEOF_CURL_OFF_T __int64
307+
# else
359308
# define CURL_FORMAT_CURL_OFF_T "I64d"
360309
# define CURL_FORMAT_CURL_OFF_TU "I64u"
361-
# define CURL_SUFFIX_CURL_OFF_T i64
362-
# define CURL_SUFFIX_CURL_OFF_TU ui64
363-
# else
364-
# define CURL_TYPEOF_CURL_OFF_T long
365-
# define CURL_FORMAT_CURL_OFF_T "ld"
366-
# define CURL_FORMAT_CURL_OFF_TU "lu"
367-
# define CURL_SUFFIX_CURL_OFF_T L
368-
# define CURL_SUFFIX_CURL_OFF_TU UL
369310
# endif
311+
# define CURL_TYPEOF_CURL_OFF_T __int64
312+
# define CURL_SUFFIX_CURL_OFF_T i64
313+
# define CURL_SUFFIX_CURL_OFF_TU ui64
370314
# define CURL_TYPEOF_CURL_SOCKLEN_T int
371315

372316
/* ===================================== */
@@ -403,12 +347,12 @@
403347

404348
#else
405349
/* generic "safe guess" on old 32-bit style */
406-
# define CURL_TYPEOF_CURL_OFF_T long
407-
# define CURL_FORMAT_CURL_OFF_T "ld"
408-
# define CURL_FORMAT_CURL_OFF_TU "lu"
409-
# define CURL_SUFFIX_CURL_OFF_T L
410-
# define CURL_SUFFIX_CURL_OFF_TU UL
411-
# define CURL_TYPEOF_CURL_SOCKLEN_T int
350+
# define CURL_TYPEOF_CURL_OFF_T long
351+
# define CURL_FORMAT_CURL_OFF_T "ld"
352+
# define CURL_FORMAT_CURL_OFF_TU "lu"
353+
# define CURL_SUFFIX_CURL_OFF_T L
354+
# define CURL_SUFFIX_CURL_OFF_TU UL
355+
# define CURL_TYPEOF_CURL_SOCKLEN_T int
412356
#endif
413357

414358
#ifdef _AIX
@@ -462,7 +406,7 @@
462406

463407
#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus) || \
464408
defined(__HP_aCC) || defined(__BORLANDC__) || defined(__LCC__) || \
465-
defined(__POCC__) || defined(__SALFORDC__) || defined(__HIGHC__) || \
409+
defined(__POCC__) || defined(__HIGHC__) || \
466410
defined(__ILEC400__)
467411
/* This compiler is believed to have an ISO compatible preprocessor */
468412
#define CURL_ISOCPP

0 commit comments

Comments
 (0)