Skip to content

Commit 28c3bab

Browse files
authored
Update libcurl to 7.88.1 (#487)
1 parent 35c8cd5 commit 28c3bab

File tree

5 files changed

+22
-7
lines changed

5 files changed

+22
-7
lines changed

curl-sys/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "curl-sys"
3-
version = "0.4.59+curl-7.86.0"
3+
version = "0.4.60+curl-7.88.1"
44
authors = ["Alex Crichton <[email protected]>"]
55
links = "curl"
66
build = "build.rs"

curl-sys/build.rs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ fn main() {
108108
.replace("@LIBCURL_LIBS@", "")
109109
.replace("@SUPPORT_FEATURES@", "")
110110
.replace("@SUPPORT_PROTOCOLS@", "")
111-
.replace("@CURLVERSION@", "7.61.1"),
111+
.replace("@CURLVERSION@", "7.88.1"),
112112
)
113113
.unwrap();
114114

@@ -141,12 +141,16 @@ fn main() {
141141
.file("curl/lib/altsvc.c")
142142
.file("curl/lib/base64.c")
143143
.file("curl/lib/bufref.c")
144+
.file("curl/lib/cfilters.c")
145+
.file("curl/lib/cf-http.c")
146+
.file("curl/lib/cf-socket.c")
144147
.file("curl/lib/conncache.c")
145148
.file("curl/lib/connect.c")
146149
.file("curl/lib/content_encoding.c")
147150
.file("curl/lib/cookie.c")
148151
.file("curl/lib/curl_addrinfo.c")
149152
.file("curl/lib/curl_get_line.c")
153+
.file("curl/lib/curl_log.c")
150154
.file("curl/lib/curl_memrchr.c")
151155
.file("curl/lib/curl_range.c")
152156
.file("curl/lib/curl_threads.c")
@@ -172,6 +176,7 @@ fn main() {
172176
.file("curl/lib/http_chunks.c")
173177
.file("curl/lib/http_digest.c")
174178
.file("curl/lib/http_proxy.c")
179+
.file("curl/lib/idn.c")
175180
.file("curl/lib/if2ip.c")
176181
.file("curl/lib/inet_ntop.c")
177182
.file("curl/lib/inet_pton.c")
@@ -210,6 +215,10 @@ fn main() {
210215
.file("curl/lib/version.c")
211216
.file("curl/lib/vauth/digest.c")
212217
.file("curl/lib/vauth/vauth.c")
218+
.file("curl/lib/vquic/curl_msh3.c")
219+
.file("curl/lib/vquic/curl_ngtcp2.c")
220+
.file("curl/lib/vquic/curl_quiche.c")
221+
.file("curl/lib/vquic/vquic.c")
213222
.file("curl/lib/vtls/hostcheck.c")
214223
.file("curl/lib/vtls/keylog.c")
215224
.file("curl/lib/vtls/vtls.c")
@@ -386,7 +395,6 @@ fn main() {
386395

387396
if target.contains("-apple-") {
388397
cfg.define("__APPLE__", None)
389-
.define("macintosh", None)
390398
.define("HAVE_MACH_ABSOLUTE_TIME", None);
391399
} else {
392400
cfg.define("HAVE_CLOCK_GETTIME_MONOTONIC", None)

curl-sys/curl

Submodule curl updated 2064 files

curl-sys/lib.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -870,7 +870,8 @@ pub const CURLVERSION_SEVENTH: CURLversion = 6;
870870
pub const CURLVERSION_EIGHTH: CURLversion = 7;
871871
pub const CURLVERSION_NINTH: CURLversion = 8;
872872
pub const CURLVERSION_TENTH: CURLversion = 9;
873-
pub const CURLVERSION_NOW: CURLversion = CURLVERSION_TENTH;
873+
pub const CURLVERSION_ELEVENTH: CURLversion = 10;
874+
pub const CURLVERSION_NOW: CURLversion = CURLVERSION_ELEVENTH;
874875

875876
#[repr(C)]
876877
pub struct curl_version_info_data {
@@ -899,6 +900,7 @@ pub struct curl_version_info_data {
899900
pub zstd_version: *const c_char,
900901
pub hyper_version: *const c_char,
901902
pub gsasl_version: *const c_char,
903+
pub feature_names: *const *const c_char,
902904
}
903905

904906
pub const CURL_VERSION_IPV6: c_int = 1 << 0;

systest/build.rs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ fn main() {
5252
_ => {}
5353
}
5454
}
55-
if version < 70 {
55+
if version < 87 {
5656
match s {
5757
"curl_version_info_data" => return true,
5858
_ => {}
@@ -64,12 +64,17 @@ fn main() {
6464

6565
// Version symbols are extracted from https://curl.se/libcurl/c/symbols-in-versions.html
6666
cfg.skip_const(move |s| {
67+
if version < 87 {
68+
match s {
69+
"CURLVERSION_ELEVENTH" | "CURLVERSION_NOW" => return true,
70+
_ => {}
71+
}
72+
}
6773
if version < 77 {
6874
match s {
6975
"CURLVERSION_TENTH"
7076
| "CURLOPT_CAINFO_BLOB"
7177
| "CURLOPT_PROXY_CAINFO_BLOB"
72-
| "CURLVERSION_NOW"
7378
| "CURL_VERSION_ALTSVC"
7479
| "CURL_VERSION_ZSTD"
7580
| "CURL_VERSION_UNICODE"

0 commit comments

Comments
 (0)