Skip to content

Update brotli submodule to v1.2.0 #82

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 5 commits into from
Nov 27, 2025
Merged

Update brotli submodule to v1.2.0 #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3c03293
Update brotli submodule to v1.2.0
jnoordsij Nov 25, 2025
d19ffa5
Update config for brotli v1.2.0
jnoordsij Nov 25, 2025
3150cd5
Update tests for brotli v1.2.0
jnoordsij Nov 25, 2025
f559ada
Add 4th argument to Windows ADD_SOURCES calls
jnoordsij Nov 27, 2025
8268a06
Split brotli source-files over lines in config.w32
jnoordsij Nov 27, 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
2 changes: 1 addition & 1 deletion brotli
Open in desktop
Submodule brotli updated 232 files
4 changes: 4 additions & 0 deletions config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,13 +103,17 @@ if test "$PHP_BROTLI" != "no"; then
brotli/c/enc/memory.c
brotli/c/enc/metablock.c
brotli/c/enc/static_dict.c
brotli/c/enc/static_dict_lut.c
brotli/c/enc/static_init.c
brotli/c/enc/utf8_util.c
"
BROTLI_DEC_SOURCES="
brotli/c/dec/bit_reader.c
brotli/c/dec/decode.c
brotli/c/dec/huffman.c
brotli/c/dec/prefix.c
brotli/c/dec/state.c
brotli/c/dec/static_init.c
"

AC_DEFINE(USE_BROTLI_BUNDLED, 1, [use bundled])
Expand Down
56 changes: 53 additions & 3 deletions config.w32
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,59 @@ if (PHP_BROTLI != "no") {
}
} else {
EXTENSION("brotli", "brotli.c", PHP_BROTLI_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
ADD_SOURCES("brotli/c/common", "constants.c context.c dictionary.c platform.c shared_dictionary.c transform.c", "brotli");
ADD_SOURCES("brotli/c/enc", "backward_references.c backward_references_hq.c bit_cost.c block_splitter.c brotli_bit_stream.c cluster.c command.c compound_dictionary.c compress_fragment.c compress_fragment_two_pass.c dictionary_hash.c encode.c encoder_dict.c entropy_encode.c fast_log.c histogram.c literal_cost.c memory.c metablock.c static_dict.c utf8_util.c", "brotli");
ADD_SOURCES("brotli/c/dec", "bit_reader.c decode.c huffman.c state.c", "brotli");
ADD_SOURCES(
"brotli/c/common",
[
"constants.c",
"context.c",
"dictionary.c",
"platform.c",
"shared_dictionary.c",
"transform.c"
].join(" "),
"brotli",
"brotli\\c\\common");
ADD_SOURCES(
"brotli/c/enc",
[
"backward_references.c",
"backward_references_hq.c",
"bit_cost.c",
"block_splitter.c",
"brotli_bit_stream.c",
"cluster.c",
"command.c",
"compound_dictionary.c",
"compress_fragment.c",
"compress_fragment_two_pass.c",
"dictionary_hash.c",
"encode.c",
"encoder_dict.c",
"entropy_encode.c",
"fast_log.c",
"histogram.c",
"literal_cost.c",
"memory.c",
"metablock.c",
"static_dict.c",
"static_dict_lut.c",
"static_init.c",
"utf8_util.c"
].join(" "),
"brotli",
"brotli\\c\\enc");
ADD_SOURCES(
"brotli/c/dec",
[
"bit_reader.c",
"decode.c",
"huffman.c",
"prefix.c",
"state.c",
"static_init.c"
].join(" "),
"brotli",
"brotli\\c\\dec");

ADD_FLAG("CFLAGS_BROTLI", " /I" + configure_module_dirname + " /I" + configure_module_dirname + "/brotli/c/include");

Expand Down
4 changes: 4 additions & 0 deletions tests/compatibility.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,3 +234,7 @@ Testing decompression of file zeros.compressed
read uncompressed .. OK
compressed .. OK
uncompressed .. OK
Testing decompression of file zerosukkanooa.compressed
read uncompressed .. OK
compressed .. OK
uncompressed .. OK