cf5920e8aa
Fix procedural finfo calls in methods
...
getThis() will return the $this of the calling method.
2014-10-16 14:24:23 +02:00
f4ebeead5d
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug #67731 finfo::file() returns invalid mime type for binary files
2014-08-30 04:05:42 +02:00
c301467f9b
Fixed bug #67731 finfo::file() returns invalid mime type for binary files
2014-08-30 04:04:42 +02:00
1e3452992f
typofixes
2014-08-17 16:00:39 +03:00
3dc9bef819
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
ext/fileinfo/data_file.c
ext/fileinfo/libmagic/softmagic.c
ext/fileinfo/magicdata.patch
2014-08-06 16:25:12 +03:00
28786a2f82
Fix bug #67705 (extensive backtracking in rule regular expression)
2014-08-04 00:09:15 -07:00
61ec9b5b0f
add test
2014-08-04 00:08:08 -07:00
15ee33eb21
Fixed bug #66307 Fileinfo crashes with powerpoint files
2014-05-26 18:04:27 -07:00
74ce9da5dc
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #66307 Fileinfo crashes with powerpoint files
Conflicts:
ext/fileinfo/libmagic/readcdf.c
2014-04-24 19:33:54 +02:00
03fa5501a8
Fixed bug #66307 Fileinfo crashes with powerpoint files
2014-04-24 19:30:34 +02:00
4019531748
fixed tests in ext/fileinfo
2014-02-19 10:04:29 +01:00
967a6771d3
updated to libmagic-5.17
2014-02-19 10:02:36 +01:00
89f864c547
Fixed Bug #66731 file: infinite recursion
...
Upstream commit (available in file-5.17)
https://github.com/glensc/file/commit/3c081560c23f20b2985c285338b52c7aae9fdb0f
https://github.com/glensc/file/commit/cc9e74dfeca5265ad725acc926ef0b8d2a18ee70
2014-02-18 13:54:33 +01:00
35101e9ef4
a few typofixes
2014-02-14 14:51:10 +02:00
8d86597d73
non living code related typo fixes
2013-08-04 16:05:36 -07:00
e9a95d78ef
typo fixes
2013-07-15 00:23:03 -07:00
ac40c0b562
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:20:18 -07:00
bcdac7526d
reduced the file size even more
...
the first second is what at least has to be
2013-05-25 00:09:32 +02:00
2d386db878
Fixed bug #64916 finfo testcase contains copyrighted music.
...
I wasn't able to produce a file causing exactly the same crash.
However the first three seconds of the originally reported
file are pretty enough to repro bug #64830 . That reduces its
size to 72k.
2013-05-24 23:58:31 +02:00
74555e7c26
Fixed bug #64830 mimetype detection segfaults on mp3 file
2013-05-14 09:40:43 +02:00
10367fa7c6
upgraded libmagic to 5.14
2013-04-07 22:15:56 +02:00
d88017e992
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows
Conflicts:
NEWS
ext/fileinfo/libmagic.patch
ext/fileinfo/tests/finfo_open_error-win32.phpt
2012-11-27 16:45:25 +01:00
e6b727d3b7
Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows
2012-11-27 16:33:58 +01:00
0d7965f0a3
Merge the fix for #61964 to 5.3, which will fix #63304
2012-10-18 23:29:33 +08:00
1916bb223e
Merge branch 'pull-request/91' into PHP-5.4
...
* pull-request/91:
Fixed bug #61964 (finfo_open with directory cause invalid free)
2012-07-14 18:52:24 -07:00
cf91b163e1
fixed the test for warnings changed
2012-07-12 18:24:38 +02:00
3faebe2bec
Fix bug #62270 Test bug - ext/fileinfo/tests/finfo_open_error-win32
2012-06-14 17:59:39 +02:00
c0e046a130
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug #62150 Test Bug - ext/fileinfo/tests/finfo_open_error.phpt
Bug #62177 deactivate the linux test version on win
Fix bug #62177 Test Bug - finfo_file_regex.phpt
2012-05-29 16:43:20 +02:00
ad0371ac7e
Fix bug #62150 Test Bug - ext/fileinfo/tests/finfo_open_error.phpt
2012-05-29 16:38:57 +02:00
b4b0aaae93
Bug #62177 deactivate the linux test version on win
2012-05-29 16:37:19 +02:00
dbc727373c
Fix bug #62177 Test Bug - finfo_file_regex.phpt
2012-05-29 16:31:47 +02:00
1d2f619049
Fixed bug #61964 (finfo_open with directory cause invalid free)
2012-05-25 18:55:34 +08:00
84b2c39920
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
- Fixed magic file regex support
2012-05-24 13:43:35 -03:00
11b4f3becd
- Fixed magic file regex support
2012-05-24 13:42:47 -03:00
da1b534601
Fix bug #61811 three of finfo tests failed, see also #61812 .
...
The remaining two was assidentially merged back from 5.4
2012-04-22 19:26:54 +02:00
909713e233
Bug #61566 Fileinfo ext\fileinfo\tests\finfo_file_002.phpt fails
...
This patch fixes the failure caused by the
posix lseek and read versions under windows in cdf_read() .
Additionally all the occurences of lseek and read
was replaced by _lseek and _reed for windows.
2012-04-02 17:22:46 +02:00
d0e3289d12
- fix test for 5.11
2012-03-27 14:01:38 +02:00
12cf930a40
Fix bug #61504 , potential vuln. in fileinfo. update to 5.11
2012-03-27 13:34:46 +02:00
e96a172114
Fix test, which was broken by the fix for #61173
2012-03-22 17:10:03 +08:00
48666d9ffc
- Fixed bug #61173 (Unable to detect error from finfo constructor).
...
- Tidied up NEWS
2012-02-24 10:01:39 +00:00
b6137f4cb1
- Fixed memory leak when calling the Finfo constructor twice
2011-11-23 01:20:49 +00:00
7c1a9e37ca
Bug#54016 (finfo_file() Cannot determine filetype in archives)
2011-02-14 15:32:02 +00:00
fdf0395e49
- Fixed bug #51732 , Fileinfo __construct or open does not work with NULL
2010-05-04 08:48:58 +00:00
e10b18693c
MFH fileinfo tests are missing skipif
2009-03-15 23:17:28 +00:00
7a29c8f386
MFH Update fileinfo to libmagic 5.00 and remove dependency on dirent.h on Windows
2009-03-15 23:04:19 +00:00
3a93ef37c4
MFH Warnings from libmagic should be notices rather than sent to stderr, this fixes a test on Windows
2008-11-22 10:29:05 +00:00
3e543f2464
MFH: Sync libmagic with 4.26 and add support for the new v6 magic file format
2008-11-02 16:13:49 +00:00
bac72c6052
- MFH: Fixed mime-type generation.
...
#- Charset markers need to be prepended with ; -- the tests were also wrong.
2008-10-08 09:44:24 +00:00
7251de9eb8
MFH: More fileinfo tests.
2008-09-15 08:51:43 +00:00
11319aa113
- New test
2008-09-02 19:28:21 +00:00
Nikita Popov