foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-11-28 16:20:57 -05:00
Code Issues Packages 1 Wiki Activity

chore: use zlib-ng for flate2 (#20059)

Browse source 
Extracted from PR #16011
This commit is contained in:
Matt Mastracci 2023-08-05 15:43:16 -06:00 committed by GitHub
parent a1280c36c2
commit 85a2b281f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 30 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Cargo.lock generated
View file

@ -579,6 +579,15 @@ dependencies = [
"winapi", "winapi",
] ]
[[package]]
name = "cmake"
version = "0.1.50"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130"
dependencies = [
"cc",
]
[[package]] [[package]]
name = "colorchoice" name = "colorchoice"
version = "1.0.0" version = "1.0.0"
@ -2070,6 +2079,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743"
dependencies = [ dependencies = [
"crc32fast", "crc32fast",
"libz-ng-sys",
"miniz_oxide", "miniz_oxide",
] ]
@ -2958,6 +2968,16 @@ dependencies = [
"vcpkg", "vcpkg",
] ]
[[package]]
name = "libz-ng-sys"
version = "1.1.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3dd9f43e75536a46ee0f92b758f6b63846e594e86638c61a9251338a65baea63"
dependencies = [
"cmake",
"libc",
]
[[package]] [[package]]
name = "libz-sys" name = "libz-sys"
version = "1.1.8" version = "1.1.8"

2
Cargo.toml
View file

@ -92,7 +92,7 @@ encoding_rs = "=0.8.31"
ecb = "=0.1.1" ecb = "=0.1.1"
fastwebsockets = "=0.3.1" fastwebsockets = "=0.3.1"
filetime = "0.2.16" filetime = "0.2.16"
flate2 = "1.0.26" flate2 = { version = "1.0.26", features = ["zlib-ng"], default-features = false }
fs3 = "0.5.0" fs3 = "0.5.0"
futures = "0.3.21" futures = "0.3.21"
glob = "0.3.1" glob = "0.3.1"

6
cli/tests/unit/http_test.ts
View file

@ -2043,9 +2043,9 @@ Deno.test({
const output = decoder.decode(stdout); const output = decoder.decode(stdout);
assert(output.includes("vary: Accept-Encoding\r\n")); assert(output.includes("vary: Accept-Encoding\r\n"));
assert(output.includes("content-encoding: gzip\r\n")); assert(output.includes("content-encoding: gzip\r\n"));
// Ensure the content-length header is updated. // Ensure the content-length header is updated (but don't check the exact length).
assert(!output.includes(`content-length: ${contentLength}\r\n`)); assert(!output.includes(`content-length: ${contentLength}\r\n`));
assert(output.includes("content-length: 72\r\n")); assert(output.includes("content-length: "));
} }
await Promise.all([server(), client()]); await Promise.all([server(), client()]);
@ -2106,7 +2106,7 @@ Deno.test({
assert(output.includes("content-encoding: gzip\r\n")); assert(output.includes("content-encoding: gzip\r\n"));
// Ensure the content-length header is updated. // Ensure the content-length header is updated.
assert(!output.includes(`content-length: ${contentLength}\r\n`)); assert(!output.includes(`content-length: ${contentLength}\r\n`));
assert(output.includes("content-length: 80\r\n")); assert(output.includes("content-length: "));
proc.close(); proc.close();
} }

8
tools/wpt/expectation.json
View file

@ -7619,8 +7619,12 @@
"decompression-constructor-error.tentative.any.worker.html": true, "decompression-constructor-error.tentative.any.worker.html": true,
"decompression-correct-input.tentative.any.html": true, "decompression-correct-input.tentative.any.html": true,
"decompression-correct-input.tentative.any.worker.html": true, "decompression-correct-input.tentative.any.worker.html": true,
"decompression-corrupt-input.tentative.any.html": true, "decompression-corrupt-input.tentative.any.html": [
"decompression-corrupt-input.tentative.any.worker.html": true, "truncating the input for 'deflate' should give an error"
],
"decompression-corrupt-input.tentative.any.worker.html": [
"truncating the input for 'deflate' should give an error"
],
"decompression-empty-input.tentative.any.html": true, "decompression-empty-input.tentative.any.html": true,
"decompression-empty-input.tentative.any.worker.html": true, "decompression-empty-input.tentative.any.worker.html": true,
"decompression-split-chunk.tentative.any.html": true, "decompression-split-chunk.tentative.any.html": true,