Skip to content

Update curl to 8.14.1 #606

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 6, 2025
Merged

Update curl to 8.14.1 #606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e6aac83
Squelch deprecated warning in systest
ehuss Jun 6, 2025
78bc883
Update curl to 8.14.1
ehuss Jun 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions curl-sys/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "curl-sys"
version = "0.4.80+curl-8.12.1"
version = "0.4.80+curl-8.14.1"
authors = ["Alex Crichton <[email protected]>"]
links = "curl"
build = "build.rs"
Expand All @@ -22,7 +22,7 @@ libc = "0.2.2"
libnghttp2-sys = { optional = true, version = "0.1.3" }

[dependencies.rustls-ffi]
version = "0.14"
version = "0.15"
optional = true
features = ["no_log_capture"]

Expand Down
47 changes: 27 additions & 20 deletions curl-sys/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ fn main() {
.replace("@LIBCURL_LIBS@", "")
.replace("@SUPPORT_FEATURES@", "")
.replace("@SUPPORT_PROTOCOLS@", "")
.replace("@CURLVERSION@", "8.12.1"),
.replace("@CURLVERSION@", "8.14.1"),
)
.unwrap();

Expand Down Expand Up @@ -138,30 +138,39 @@ fn main() {
.define("HAVE_LIBZ", None)
.define("HAVE_BOOL_T", None)
.define("HAVE_STDBOOL_H", None)
.file("curl/lib/asyn-thread.c")
.file("curl/lib/altsvc.c")
.file("curl/lib/base64.c")
.file("curl/lib/asyn-base.c")
.file("curl/lib/asyn-thrdd.c")
.file("curl/lib/bufq.c")
.file("curl/lib/bufref.c")
.file("curl/lib/cfilters.c")
.file("curl/lib/cf-h1-proxy.c")
.file("curl/lib/cf-haproxy.c")
.file("curl/lib/cf-https-connect.c")
.file("curl/lib/cf-socket.c")
.file("curl/lib/cfilters.c")
.file("curl/lib/conncache.c")
.file("curl/lib/connect.c")
.file("curl/lib/content_encoding.c")
.file("curl/lib/cookie.c")
.file("curl/lib/cshutdn.c")
.file("curl/lib/curl_addrinfo.c")
.file("curl/lib/curl_get_line.c")
.file("curl/lib/curl_memrchr.c")
.file("curl/lib/curl_range.c")
.file("curl/lib/curl_sha512_256.c")
.file("curl/lib/curl_threads.c")
.file("curl/lib/curl_trc.c")
.file("curl/lib/curlx/base64.c")
.file("curl/lib/curlx/dynbuf.c")
.file("curl/lib/curlx/inet_pton.c")
.file("curl/lib/curlx/nonblock.c")
.file("curl/lib/curlx/strparse.c")
.file("curl/lib/curlx/timediff.c")
.file("curl/lib/curlx/timeval.c")
.file("curl/lib/curlx/warnless.c")
.file("curl/lib/cw-out.c")
.file("curl/lib/cw-pause.c")
.file("curl/lib/doh.c")
.file("curl/lib/dynbuf.c")
.file("curl/lib/dynhds.c")
.file("curl/lib/easy.c")
.file("curl/lib/escape.c")
Expand All @@ -174,7 +183,6 @@ fn main() {
.file("curl/lib/hash.c")
.file("curl/lib/headers.c")
.file("curl/lib/hmac.c")
.file("curl/lib/hostasyn.c")
.file("curl/lib/hostip.c")
.file("curl/lib/hostip6.c")
.file("curl/lib/hsts.c")
Expand All @@ -187,16 +195,15 @@ fn main() {
.file("curl/lib/idn.c")
.file("curl/lib/if2ip.c")
.file("curl/lib/inet_ntop.c")
.file("curl/lib/inet_pton.c")
.file("curl/lib/llist.c")
.file("curl/lib/macos.c")
.file("curl/lib/md5.c")
.file("curl/lib/mime.c")
.file("curl/lib/macos.c")
.file("curl/lib/mprintf.c")
.file("curl/lib/mqtt.c")
.file("curl/lib/multi.c")
.file("curl/lib/multi_ev.c")
.file("curl/lib/netrc.c")
.file("curl/lib/nonblock.c")
.file("curl/lib/noproxy.c")
.file("curl/lib/parsedate.c")
.file("curl/lib/progress.c")
Expand All @@ -209,35 +216,33 @@ fn main() {
.file("curl/lib/sha256.c")
.file("curl/lib/share.c")
.file("curl/lib/slist.c")
.file("curl/lib/socks.c")
.file("curl/lib/socketpair.c")
.file("curl/lib/socks.c")
.file("curl/lib/speedcheck.c")
.file("curl/lib/splay.c")
.file("curl/lib/strcase.c")
.file("curl/lib/strdup.c")
.file("curl/lib/strequal.c")
.file("curl/lib/strerror.c")
.file("curl/lib/strparse.c")
.file("curl/lib/strtok.c")
.file("curl/lib/strtoofft.c")
.file("curl/lib/timeval.c")
.file("curl/lib/transfer.c")
.file("curl/lib/uint-bset.c")
.file("curl/lib/uint-spbset.c")
.file("curl/lib/uint-table.c")
.file("curl/lib/url.c")
.file("curl/lib/urlapi.c")
.file("curl/lib/version.c")
.file("curl/lib/vauth/digest.c")
.file("curl/lib/vauth/vauth.c")
.file("curl/lib/version.c")
.file("curl/lib/vquic/curl_msh3.c")
.file("curl/lib/vquic/curl_ngtcp2.c")
.file("curl/lib/vquic/curl_osslq.c")
.file("curl/lib/vquic/curl_quiche.c")
.file("curl/lib/vquic/vquic.c")
.file("curl/lib/vquic/vquic-tls.c")
.file("curl/lib/vquic/vquic.c")
.file("curl/lib/vtls/hostcheck.c")
.file("curl/lib/vtls/keylog.c")
.file("curl/lib/vtls/vtls.c")
.file("curl/lib/vtls/vtls_scache.c")
.file("curl/lib/warnless.c")
.file("curl/lib/timediff.c")
.file("curl/lib/ws.c")
.define("HAVE_GETADDRINFO", None)
.define("HAVE_GETPEERNAME", None)
Expand Down Expand Up @@ -296,6 +301,7 @@ fn main() {
cfg.define("USE_RUSTLS", None)
.file("curl/lib/vtls/cipher_suite.c")
.file("curl/lib/vtls/rustls.c")
.file("curl/lib/vtls/x509asn1.c")
.include(env::var_os("DEP_RUSTLS_FFI_INCLUDE").unwrap());
} else if cfg!(feature = "windows-static-ssl") {
if windows {
Expand Down Expand Up @@ -362,9 +368,10 @@ fn main() {
.define("USE_WINSOCK", None)
.file("curl/lib/bufref.c")
.file("curl/lib/system_win32.c")
.file("curl/lib/version_win32.c")
.file("curl/lib/vauth/digest_sspi.c")
.file("curl/lib/curl_multibyte.c");
.file("curl/lib/curlx/multibyte.c")
.file("curl/lib/curlx/version_win32.c")
.file("curl/lib/curlx/winapi.c");

if cfg!(feature = "spnego") {
cfg.file("curl/lib/vauth/spnego_sspi.c");
Expand Down
2 changes: 1 addition & 1 deletion curl-sys/curl
Open in desktop
Submodule curl updated 1599 files
25 changes: 15 additions & 10 deletions systest/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,7 @@ fn main() {
cfg.skip_const(move |s| {
if version < (8, 10) {
match s {
"CURLVERSION_TWELFTH"
| "CURLVERSION_NOW"
| "CURLOPT_WRITEINFO"
| "CURLOPT_CLOSEPOLICY" => return true,
"CURLVERSION_TWELFTH" | "CURLVERSION_NOW" => return true,
_ => {}
}
}
Expand Down Expand Up @@ -261,12 +258,20 @@ fn main() {
}
}

// OSX doesn't have this yet
s == "CURLSSLOPT_NO_REVOKE" ||

// A lot of curl versions doesn't support unix sockets
s == "CURLOPT_UNIX_SOCKET_PATH" || s == "CURL_VERSION_UNIX_SOCKETS" || s ==
"CURLOPT_ABSTRACT_UNIX_SOCKET"
match s {
// OSX doesn't have this yet
"CURLSSLOPT_NO_REVOKE"
// A lot of curl versions doesn't support unix sockets
| "CURLOPT_UNIX_SOCKET_PATH"
| "CURL_VERSION_UNIX_SOCKETS"
| "CURLOPT_ABSTRACT_UNIX_SOCKET"
// These two are deprecated, and their value changed in 8.10.
// Systest generates deprecated warnings which isn't helpful.
// These should be removed in the next semver major bump.
| "CURLOPT_WRITEINFO"
| "CURLOPT_CLOSEPOLICY" => true,
_ => false,
}
});

if cfg!(target_env = "msvc") {
Expand Down