Skip to content

Commit 1de49bd

Browse files
authored
Update curl submodule to 7.67.0 (#311)
1 parent 1ba8171 commit 1de49bd

File tree

4 files changed

+16
-3
lines changed

4 files changed

+16
-3
lines changed

.github/workflows/main.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
name: CI
2-
on: [push, pull_request]
2+
on:
3+
push:
4+
branches: [master]
5+
pull_request:
6+
branches: [master]
37

48
jobs:
59
test:

curl-sys/build.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@ fn main() {
171171
.file("curl/lib/share.c")
172172
.file("curl/lib/slist.c")
173173
.file("curl/lib/socks.c")
174+
.file("curl/lib/socketpair.c")
174175
.file("curl/lib/speedcheck.c")
175176
.file("curl/lib/splay.c")
176177
.file("curl/lib/strcase.c")
@@ -292,6 +293,7 @@ fn main() {
292293
.define("HAVE_SEND", None)
293294
.define("HAVE_SOCKET", None)
294295
.define("HAVE_STERRROR_R", None)
296+
.define("HAVE_SOCKETPAIR", None)
295297
.define("HAVE_STRUCT_TIMEVAL", None)
296298
.define("USE_THREADS_POSIX", None)
297299
.define("RECV_TYPE_ARG2", "void*")

curl-sys/curl

Submodule curl updated 393 files

systest/build.rs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ fn main() {
2121
.next()
2222
.and_then(|s| s.parse::<u32>().ok())
2323
.unwrap_or(10000);
24+
println!("got version: {}", version);
2425

2526
if env::var("TARGET").unwrap().contains("msvc") {
2627
cfg.flag("/wd4574"); // did you mean to use '#if INCL_WINSOCK_API_TYPEDEFS'
@@ -60,6 +61,12 @@ fn main() {
6061
});
6162

6263
cfg.skip_const(move |s| {
64+
if version < 65 {
65+
match s {
66+
"CURLVERSION_SIXTH" | "CURLVERSION_NOW" => return true,
67+
_ => {}
68+
}
69+
}
6370
if version < 64 {
6471
match s {
6572
"CURLE_HTTP2" => return true,
@@ -81,7 +88,7 @@ fn main() {
8188
}
8289
if version < 60 {
8390
match s {
84-
"CURLVERSION_FIFTH" | "CURLVERSION_SIXTH" | "CURLVERSION_NOW" => return true,
91+
"CURLVERSION_FIFTH" => return true,
8592
_ => {}
8693
}
8794
}

0 commit comments

Comments
 (0)