Skip to content

Commit edff874

Browse files
github-actions[bot]github-actions[bot]
committed
Synchronize changes from 1.6 master branch [ci skip]
4b2fcf4 Update cURL to 8.15.0 (#4358)
2 parents 42e3746 + 4b2fcf4 commit edff874

File tree

696 files changed

+27331
-22248
lines changed

Some content is hidden

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

696 files changed

+27331
-22248
lines changed

‎vendor/curl/CMake/CurlTests.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ int main(void)
203203
#ifdef HAVE_UNISTD_H
204204
# include <unistd.h>
205205
#endif
206-
#ifdef HAVE_SYS_SOCKET_H
206+
#ifndef _WIN32
207207
# include <sys/socket.h>
208208
#endif
209209
#ifdef HAVE_SYS_IOCTL_H
@@ -230,7 +230,7 @@ int main(void)
230230
#ifdef HAVE_UNISTD_H
231231
# include <unistd.h>
232232
#endif
233-
#ifdef HAVE_SYS_SOCKET_H
233+
#ifndef _WIN32
234234
# include <sys/socket.h>
235235
#endif
236236
#ifdef HAVE_SYS_IOCTL_H
@@ -257,7 +257,7 @@ int main(void)
257257
#ifdef HAVE_SYS_TYPES_H
258258
# include <sys/types.h>
259259
#endif
260-
#ifdef HAVE_SYS_SOCKET_H
260+
#ifndef _WIN32
261261
# include <sys/socket.h>
262262
#endif
263263
int main(void)

‎vendor/curl/RELEASE-NOTES

Lines changed: 364 additions & 83 deletions
Large diffs are not rendered by default.

‎vendor/curl/docs/.gitignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Copyright (C) Daniel Stenberg, <[email protected]>, et al.
2+
#
3+
# SPDX-License-Identifier: curl
4+
5+
*.1
6+
*.3
7+
RELEASE-TOOLS.md.dist

‎vendor/curl/docs/cmdline-opts/.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Copyright (C) Daniel Stenberg, <[email protected]>, et al.
2+
#
3+
# SPDX-License-Identifier: curl
4+
5+
curl.txt

‎vendor/curl/docs/examples/.gitignore

Lines changed: 134 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,134 @@
1+
# Copyright (C) Daniel Stenberg, <[email protected]>, et al.
2+
#
3+
# SPDX-License-Identifier: curl
4+
5+
10-at-a-time
6+
address-scope
7+
altsvc
8+
anyauthput
9+
block_ip
10+
cacertinmem
11+
certinfo
12+
chkspeed
13+
connect-to
14+
cookie_interface
15+
crawler
16+
debug
17+
default-scheme
18+
ephiperfifo
19+
evhiperfifo
20+
externalsocket
21+
fileupload
22+
ftp-delete
23+
ftp-wildcard
24+
ftpget
25+
ftpgetinfo
26+
ftpgetresp
27+
ftpsget
28+
ftpupload
29+
ftpuploadfrommem
30+
ftpuploadresume
31+
getinfo
32+
getinmemory
33+
getredirect
34+
getreferrer
35+
ghiper
36+
headerapi
37+
hiperfifo
38+
href_extractor
39+
hsts-preload
40+
htmltidy
41+
http-options
42+
http-post
43+
http2-download
44+
http2-pushinmemory
45+
http2-serverpush
46+
http2-upload
47+
http3
48+
http3-present
49+
httpcustomheader
50+
httpput
51+
httpput-postfields
52+
https
53+
imap-append
54+
imap-authzid
55+
imap-copy
56+
imap-create
57+
imap-delete
58+
imap-examine
59+
imap-fetch
60+
imap-list
61+
imap-lsub
62+
imap-multi
63+
imap-noop
64+
imap-search
65+
imap-ssl
66+
imap-store
67+
imap-tls
68+
interface
69+
ipv6
70+
keepalive
71+
localport
72+
maxconnects
73+
multi-app
74+
multi-debugcallback
75+
multi-double
76+
multi-event
77+
multi-formadd
78+
multi-legacy
79+
multi-post
80+
multi-single
81+
multi-uv
82+
multithread
83+
netrc
84+
parseurl
85+
persistent
86+
pop3-authzid
87+
pop3-dele
88+
pop3-list
89+
pop3-multi
90+
pop3-noop
91+
pop3-retr
92+
pop3-ssl
93+
pop3-stat
94+
pop3-tls
95+
pop3-top
96+
pop3-uidl
97+
post-callback
98+
postinmemory
99+
postit2
100+
postit2-formadd
101+
progressfunc
102+
protofeats
103+
range
104+
resolve
105+
rtsp-options
106+
sendrecv
107+
sepheaders
108+
sessioninfo
109+
sftpget
110+
sftpuploadresume
111+
shared-connection-cache
112+
simple
113+
simplepost
114+
simplessl
115+
smooth-gtk-thread
116+
smtp-authzid
117+
smtp-expn
118+
smtp-mail
119+
smtp-mime
120+
smtp-multi
121+
smtp-ssl
122+
smtp-tls
123+
smtp-vrfy
124+
sslbackend
125+
synctime
126+
threaded-ssl
127+
unixsocket
128+
url2file
129+
urlapi
130+
usercertinmem
131+
websocket
132+
websocket-cb
133+
websocket-updown
134+
xmlstream

‎vendor/curl/docs/examples/altsvc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ int main(void)
4141
curl_easy_setopt(curl, CURLOPT_ALTSVC, "altsvc.txt");
4242

4343
/* restrict which HTTP versions to use alternatives */
44-
curl_easy_setopt(curl, CURLOPT_ALTSVC_CTRL, (long)
45-
CURLALTSVC_H1|CURLALTSVC_H2|CURLALTSVC_H3);
44+
curl_easy_setopt(curl, CURLOPT_ALTSVC_CTRL,
45+
CURLALTSVC_H1 | CURLALTSVC_H2 | CURLALTSVC_H3);
4646

4747
/* Perform the request, res gets the return code */
4848
res = curl_easy_perform(curl);

‎vendor/curl/docs/examples/anyauthput.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ static int my_seek(void *userp, curl_off_t offset, int origin)
6161
{
6262
FILE *fp = (FILE *) userp;
6363

64-
if(-1 == fseek(fp, (long) offset, origin))
64+
if(fseek(fp, (long) offset, origin) == -1)
6565
/* could not seek */
6666
return CURL_SEEKFUNC_CANTSEEK;
6767

@@ -142,7 +142,7 @@ int main(int argc, char **argv)
142142
/* tell libcurl we can use "any" auth, which lets the lib pick one, but it
143143
also costs one extra round-trip and possibly sending of all the PUT
144144
data twice!!! */
145-
curl_easy_setopt(curl, CURLOPT_HTTPAUTH, (long)CURLAUTH_ANY);
145+
curl_easy_setopt(curl, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
146146

147147
/* set user name and password for the authentication */
148148
curl_easy_setopt(curl, CURLOPT_USERPWD, "user:password");

‎vendor/curl/docs/examples/block_ip.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ static struct ip *ip_list_append(struct ip *list, const char *data)
155155
ip->maskbits = 128;
156156
#endif
157157

158-
if(1 != inet_pton(ip->family, ip->str, &ip->netaddr)) {
158+
if(inet_pton(ip->family, ip->str, &ip->netaddr) != 1) {
159159
free(ip->str);
160160
free(ip);
161161
return NULL;

‎vendor/curl/docs/examples/cacertinmem.c

Lines changed: 19 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -41,60 +41,39 @@ static size_t writefunction(void *ptr, size_t size, size_t nmemb, void *stream)
4141
return nmemb * size;
4242
}
4343

44-
static CURLcode sslctx_function(CURL *curl, void *sslctx, void *parm)
44+
static CURLcode sslctx_function(CURL *curl, void *sslctx, void *pointer)
4545
{
4646
CURLcode rv = CURLE_ABORTED_BY_CALLBACK;
4747

4848
/** This example uses two (fake) certificates **/
49+
/* replace the XXX with the actual CA certificates */
4950
static const char mypem[] =
5051
"-----BEGIN CERTIFICATE-----\n"
51-
"MIIH0zCCBbugAwIBAgIIXsO3pkN/pOAwDQYJKoZIhvcNAQEFBQAwQjESMBAGA1UE\n"
52-
"AwwJQUNDVlJBSVoxMRAwDgYDVQQLDAdQS0lBQ0NWMQ0wCwYDVQQKDARBQ0NWMQsw\n"
53-
"CQYDVQQGEwJFUzAeFw0xMTA1MDUwOTM3MzdaFw0zMDEyMzEwOTM3MzdaMEIxEjAQ\n"
54-
"BgNVBAMMCUFDQ1ZSQUlaMTEQMA4GA1UECwwHUEtJQUNDVjENMAsGA1UECgwEQUND\n"
55-
"VjELMAkGA1UEBhMCRVMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCb\n"
56-
"qau/YUqXry+XZpp0X9DZlv3P4uRm7x8fRzPCRKPfmt4ftVTdFXxpNRFvu8gMjmoY\n"
57-
"HtiP2Ra8EEg2XPBjs5BaXCQ316PWywlxufEBcoSwfdtNgM3802/J+Nq2DoLSRYWo\n"
58-
"G2ioPej0RGy9ocLLA76MPhMAhN9KSMDjIgro6TenGEyxCQ0jVn8ETdkXhBilyNpA\n"
59-
"0KIV9VMJcRz/RROE5iZe+OCIHAr8Fraocwa48GOEAqDGWuzndN9wrqODJerWx5eH\n"
60-
"k6fGioozl2A3ED6XPm4pFdahD9GILBKfb6qkxkLrQaLjlUPTAYVtjrs78yM2x/47\n"
61-
"JyCpZET/LtZ1qmxNYEAZSUNUY9rizLpm5U9EelvZaoErQNV/+QEnWCzI7UiRfD+m\n"
62-
"AM/EKXMRNt6GGT6d7hmKG9Ww7Y49nCrADdg9ZuM8Db3VlFzi4qc1GwQA9j9ajepD\n"
63-
"vV+JHanBsMyZ4k0ACtrJJ1vnE5Bc5PUzolVt3OAJTS+xJlsndQAJxGJ3KQhfnlms\n"
64-
"tn6tn1QwIgPBHnFk/vk4CpYY3QIUrCPLBhwepH2NDd4nQeit2hW3sCPdK6jT2iWH\n"
65-
"7ehVRE2I9DZ+hJp4rPcOVkkO1jMl1oRQQmwgEh0q1b688nCBpHBgvgW1m54ERL5h\n"
66-
"I6zppSSMEYCUWqKiuUnSwdzRp+0xESyeGabu4VXhwOrPDYTkF7eifKXeVSUG7szA\n"
67-
"h1xA2syVP1XgNce4hL60Xc16gwFy7ofmXx2utYXGJt/mwZrpHgJHnyqobalbz+xF\n"
68-
"d3+YJ5oyXSrjhO7FmGYvliAd3djDJ9ew+f7Zfc3Qn48LFFhRny+Lwzgt3uiP1o2H\n"
69-
"pPVWQxaZLPSkVrQ0uGE3ycJYgBugl6H8WY3pEfbRD0tVNEYqi4Y7\n"
52+
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\n"\
53+
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\n"\
54+
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\n"\
55+
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\n"\
56+
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\n"\
57+
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\n"\
58+
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\n"\
7059
"-----END CERTIFICATE-----\n"
7160
"-----BEGIN CERTIFICATE-----\n"
72-
"MIIFtTCCA52gAwIBAgIIYY3HhjsBggUwDQYJKoZIhvcNAQEFBQAwRDEWMBQGA1UE\n"
73-
"AwwNQUNFRElDT00gUm9vdDEMMAoGA1UECwwDUEtJMQ8wDQYDVQQKDAZFRElDT00x\n"
74-
"CzAJBgNVBAYTAkVTMB4XDTA4MDQxODE2MjQyMloXDTI4MDQxMzE2MjQyMlowRDEW\n"
75-
"MBQGA1UEAwwNQUNFRElDT00gUm9vdDEMMAoGA1UECwwDUEtJMQ8wDQYDVQQKDAZF\n"
76-
"RElDT00xCzAJBgNVBAYTAkVTMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKC\n"
77-
"AgEA/5KV4WgGdrQsyFhIyv2AVClVYyT/kGWbEHV7w2rbYgIB8hiGtXxaOLHkWLn7\n"
78-
"09gtn70yN78sFW2+tfQh0hOR2QetAQXW8713zl9CgQr5auODAKgrLlUTY4HKRxx7\n"
79-
"XBZXehuDYAQ6PmXDzQHe3qTWDLqO3tkE7hdWIpuPY/1NFgu3e3eM+SW10W2ZEi5P\n"
80-
"gvoFNTPhNahXwOf9jU8/kzJPeGYDdwdY6ZXIfj7QeQCM8htRM5u8lOk6e25SLTKe\n"
81-
"I6RF+7YuE7CLGLHdztUdp0J/Vb77W7tH1PwkzQSulgUV1qzOMPPKC8W64iLgpq0i\n"
82-
"5ALudBF/TP94HTXa5gI06xgSYXcGCRZj6hitoocf8seACQl1ThCojz2GuHURwCRi\n"
83-
"ipZ7SkXp7FnFvmuD5uHorLUwHv4FB4D54SMNUI8FmP8sX+g7tq3PgbUhh8oIKiMn\n"
84-
"MCArz+2UW6yyetLHKKGKC5tNSixthT8Jcjxn4tncB7rrZXtaAWPWkFtPF2Y9fwsZ\n"
85-
"o5NjEFIqnxQWWOLcpfShFosOkYuByptZ+thrkQdlVV9SH686+5DdaaVbnG0OLLb6\n"
86-
"zqylfDJKZ0DcMDQj3dcEI2bw/FWAp/tmGYI1Z2JwOV5vx+qQQEQIHriy1tvuWacN\n"
87-
"GHk0vFQYXlPKNFHtRQrmjseCNj6nOGOpMCwXEGCSn1WHElkQwg9naRHMTh5+Spqt\n"
88-
"r0CodaxWkHS4oJyleW/c6RrIaQXpuvoDs3zk4E7Czp3otkYNbn5XOmeUwssfnHdK\n"
89-
"Z05phkOTOPu220+DkdRgfks+KzgHVZhepA==\n"
61+
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\n"\
62+
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\n"\
63+
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\n"\
64+
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\n"\
65+
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\n"\
66+
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\n"\
67+
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\n"\
9068
"-----END CERTIFICATE-----\n";
9169

9270
BIO *cbio = BIO_new_mem_buf(mypem, sizeof(mypem));
9371
X509_STORE *cts = SSL_CTX_get_cert_store((SSL_CTX *)sslctx);
9472
int i;
9573
STACK_OF(X509_INFO) *inf;
96-
(void)curl;
97-
(void)parm;
74+
75+
(void)curl; /* avoid warnings */
76+
(void)pointer; /* avoid warnings */
9877

9978
if(!cts || !cbio) {
10079
return rv;

‎vendor/curl/docs/examples/crawler.c

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,15 @@ static void sighandler(int dummy)
5555
}
5656

5757
/* resizable buffer */
58-
typedef struct {
58+
struct memory {
5959
char *buf;
6060
size_t size;
61-
} memory;
61+
};
6262

6363
static size_t grow_buffer(void *contents, size_t sz, size_t nmemb, void *ctx)
6464
{
6565
size_t realsize = sz * nmemb;
66-
memory *mem = (memory*) ctx;
66+
struct memory *mem = (struct memory*) ctx;
6767
char *ptr = realloc(mem->buf, mem->size + realsize);
6868
if(!ptr) {
6969
/* out of memory */
@@ -79,14 +79,14 @@ static size_t grow_buffer(void *contents, size_t sz, size_t nmemb, void *ctx)
7979
static CURL *make_handle(const char *url)
8080
{
8181
CURL *handle = curl_easy_init();
82-
memory *mem;
82+
struct memory *mem;
8383

8484
/* Important: use HTTP2 over HTTPS */
8585
curl_easy_setopt(handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2TLS);
8686
curl_easy_setopt(handle, CURLOPT_URL, url);
8787

8888
/* buffer body */
89-
mem = malloc(sizeof(memory));
89+
mem = malloc(sizeof(*mem));
9090
mem->size = 0;
9191
mem->buf = malloc(1);
9292
curl_easy_setopt(handle, CURLOPT_WRITEFUNCTION, grow_buffer);
@@ -119,7 +119,8 @@ static CURL *make_handle(const char *url)
119119
}
120120

121121
/* HREF finder implemented in libxml2 but could be any HTML parser */
122-
static size_t follow_links(CURLM *multi_handle, memory *mem, const char *url)
122+
static size_t follow_links(CURLM *multi_handle, struct memory *mem,
123+
const char *url)
123124
{
124125
int opts = HTML_PARSE_NOBLANKS | HTML_PARSE_NOERROR | \
125126
HTML_PARSE_NOWARNING | HTML_PARSE_NONET;
@@ -213,7 +214,7 @@ int main(void)
213214
if(m->msg == CURLMSG_DONE) {
214215
CURL *handle = m->easy_handle;
215216
char *url;
216-
memory *mem;
217+
struct memory *mem;
217218
curl_easy_getinfo(handle, CURLINFO_PRIVATE, &mem);
218219
curl_easy_getinfo(handle, CURLINFO_EFFECTIVE_URL, &url);
219220
if(m->data.result == CURLE_OK) {

0 commit comments

Comments
 (0)