Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions NEWS
2 changes: 1 addition & 1 deletion ext/fileinfo/config.m4
2 changes: 1 addition & 1 deletion ext/fileinfo/config.w32
215,637 changes: 125,291 additions & 90,346 deletions ext/fileinfo/data_file.c
2 changes: 1 addition & 1 deletion ext/fileinfo/generate_patch.sh
672 changes: 402 additions & 270 deletions ext/fileinfo/libmagic.patch
261 changes: 139 additions & 122 deletions ext/fileinfo/libmagic/apprentice.c
8 changes: 4 additions & 4 deletions ext/fileinfo/libmagic/apptype.c
38 changes: 16 additions & 22 deletions ext/fileinfo/libmagic/ascmagic.c
11 changes: 9 additions & 2 deletions ext/fileinfo/libmagic/buffer.c
2 changes: 1 addition & 1 deletion ext/fileinfo/libmagic/cdf.c
6 changes: 3 additions & 3 deletions ext/fileinfo/libmagic/cdf_time.c
389 changes: 283 additions & 106 deletions ext/fileinfo/libmagic/compress.c
12 changes: 6 additions & 6 deletions ext/fileinfo/libmagic/der.c
40 changes: 20 additions & 20 deletions ext/fileinfo/libmagic/encoding.c
162 changes: 90 additions & 72 deletions ext/fileinfo/libmagic/file.h
6 changes: 3 additions & 3 deletions ext/fileinfo/libmagic/fsmagic.c
81 changes: 47 additions & 34 deletions ext/fileinfo/libmagic/funcs.c
12 changes: 7 additions & 5 deletions ext/fileinfo/libmagic/is_csv.c
6 changes: 3 additions & 3 deletions ext/fileinfo/libmagic/is_json.c
209 changes: 209 additions & 0 deletions ext/fileinfo/libmagic/is_simh.c
14 changes: 7 additions & 7 deletions ext/fileinfo/libmagic/is_tar.c
50 changes: 28 additions & 22 deletions ext/fileinfo/libmagic/magic.c
6 changes: 5 additions & 1 deletion ext/fileinfo/libmagic/magic.h
28 changes: 16 additions & 12 deletions ext/fileinfo/libmagic/print.c
26 changes: 13 additions & 13 deletions ext/fileinfo/libmagic/readcdf.c
235 changes: 137 additions & 98 deletions ext/fileinfo/libmagic/softmagic.c
4 changes: 2 additions & 2 deletions ext/fileinfo/libmagic/tar.h
33 changes: 0 additions & 33 deletions ext/fileinfo/magicdata.patch
6 changes: 2 additions & 4 deletions ext/fileinfo/tests/bug71434.phpt
4 changes: 2 additions & 2 deletions ext/fileinfo/tests/bug77961.phpt
14 changes: 7 additions & 7 deletions ext/fileinfo/tests/bug78987.phpt
4 changes: 1 addition & 3 deletions ext/fileinfo/tests/cve-2014-1943-mb.phpt
4 changes: 1 addition & 3 deletions ext/fileinfo/tests/cve-2014-1943.phpt
2 changes: 1 addition & 1 deletion ext/fileinfo/tests/finfo_file_basic.phpt