Skip to content

Commit e220da3

Browse files
authored
Add support for zlib-ng (#351)
* Add support for zlib-ng Upgrade to libz-sys 1.1.0. Add a feature zlib-ng-compat to build with zlib-ng in zlib-compat mode. This requires building our own curl (as system curl will link with another zlib), so make zlib-ng-compat require static-curl. * Bump curl version to 0.4.32
1 parent 428fbe8 commit e220da3

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

Cargo.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "curl"
3-
version = "0.4.31"
3+
version = "0.4.32"
44
authors = ["Alex Crichton <[email protected]>"]
55
license = "MIT"
66
repository = "https://github.com/alexcrichton/curl-rust"
@@ -17,7 +17,7 @@ appveyor = { repository = "alexcrichton/curl-rust" }
1717

1818
[dependencies]
1919
libc = "0.2.42"
20-
curl-sys = { path = "curl-sys", version = "0.4.33", default-features = false }
20+
curl-sys = { path = "curl-sys", version = "0.4.35", default-features = false }
2121
socket2 = "0.3.7"
2222

2323
# Unix platforms use OpenSSL for now to provide SSL functionality
@@ -47,6 +47,7 @@ static-curl = ["curl-sys/static-curl"]
4747
static-ssl = ["curl-sys/static-ssl"]
4848
force-system-lib-on-osx = ['curl-sys/force-system-lib-on-osx']
4949
protocol-ftp = ["curl-sys/protocol-ftp"]
50+
zlib-ng-compat = ["curl-sys/zlib-ng-compat", "static-curl"]
5051

5152
[[test]]
5253
name = "atexit"

curl-sys/Cargo.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "curl-sys"
3-
version = "0.4.34+curl-7.71.1"
3+
version = "0.4.35+curl-7.71.1"
44
authors = ["Alex Crichton <[email protected]>"]
55
links = "curl"
66
build = "build.rs"
@@ -19,7 +19,7 @@ name = "curl_sys"
1919
path = "lib.rs"
2020

2121
[dependencies]
22-
libz-sys = "1.0.18"
22+
libz-sys = { version = "1.0.18", default-features = false, features = ["libc"] }
2323
libc = "0.2.2"
2424
libnghttp2-sys = { optional = true, version = "0.1.3" }
2525

@@ -51,3 +51,4 @@ static-ssl = ["openssl-sys/vendored"]
5151
spnego = []
5252
force-system-lib-on-osx = []
5353
protocol-ftp = []
54+
zlib-ng-compat = ["libz-sys/zlib-ng", "static-curl"]

0 commit comments

Comments
 (0)