Anatoliy Belsky
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
Anatoliy Belsky
e6b727d3b7
Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows
2012-11-27 16:33:58 +01:00
Xinchen Hui
0d7965f0a3
Merge the fix for #61964 to 5.3, which will fix #63304
2012-10-18 23:29:33 +08:00
Stanislav Malyshev
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
Anatoliy Belsky
cf91b163e1
fixed the test for warnings changed
2012-07-12 18:24:38 +02:00
Anatoliy Belsky
3faebe2bec
Fix bug #62270 Test bug - ext/fileinfo/tests/finfo_open_error-win32
2012-06-14 17:59:39 +02:00
Anatoliy Belsky
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
Matt Ficken
ad0371ac7e
Fix bug #62150 Test Bug - ext/fileinfo/tests/finfo_open_error.phpt
2012-05-29 16:38:57 +02:00
Matt Ficken
b4b0aaae93
Bug #62177 deactivate the linux test version on win
2012-05-29 16:37:19 +02:00
Matt Ficken
dbc727373c
Fix bug #62177 Test Bug - finfo_file_regex.phpt
2012-05-29 16:31:47 +02:00
Reeze Xia
1d2f619049
Fixed bug #61964 (finfo_open with directory cause invalid free)
2012-05-25 18:55:34 +08:00
Felipe Pena
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
Felipe Pena
11b4f3becd
- Fixed magic file regex support
2012-05-24 13:42:47 -03:00
Anatoliy Belsky
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
Anatoliy Belsky
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
Pierre Joye
d0e3289d12
- fix test for 5.11
2012-03-27 14:01:38 +02:00
Pierre Joye
12cf930a40
Fix bug #61504 , potential vuln. in fileinfo. update to 5.11
2012-03-27 13:34:46 +02:00
Xinchen Hui
e96a172114
Fix test, which was broken by the fix for #61173
2012-03-22 17:10:03 +08:00
Gustavo André dos Santos Lopes
48666d9ffc
- Fixed bug #61173 (Unable to detect error from finfo constructor).
...
- Tidied up NEWS
2012-02-24 10:01:39 +00:00
Felipe Pena
b6137f4cb1
- Fixed memory leak when calling the Finfo constructor twice
2011-11-23 01:20:49 +00:00
Hannes Magnusson
7c1a9e37ca
Bug#54016 (finfo_file() Cannot determine filetype in archives)
2011-02-14 15:32:02 +00:00
Pierre Joye
fdf0395e49
- Fixed bug #51732 , Fileinfo __construct or open does not work with NULL
2010-05-04 08:48:58 +00:00
Scott MacVicar
e10b18693c
MFH fileinfo tests are missing skipif
2009-03-15 23:17:28 +00:00
Scott MacVicar
7a29c8f386
MFH Update fileinfo to libmagic 5.00 and remove dependency on dirent.h on Windows
2009-03-15 23:04:19 +00:00
Scott MacVicar
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
Scott MacVicar
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
Derick Rethans
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
Felix De Vliegher
7251de9eb8
MFH: More fileinfo tests.
2008-09-15 08:51:43 +00:00
Felipe Pena
11319aa113
- New test
2008-09-02 19:28:21 +00:00
Pierre Joye
ed4db08f69
- fix test (file or path not found) (Thanks Dmitry for the notice)
2008-09-02 10:28:11 +00:00
Pierre Joye
c8a0c3b0f5
- don't close caller streams in libmagic (prevent leak and zombie stream)
...
- string returned by magic_* are freed on magic_close, duplicate before
calling magic_close (set return value)
- if stat failed, don't try to call magic_* (when FILEINFO_MODE_FILE)
2008-09-02 10:15:54 +00:00
Felipe Pena
d13b704d25
- Fixed mime_content_type() behavior when a string is given
...
- Fixed check for "empty file name"
- MFH: New test
2008-09-01 23:44:00 +00:00
Pierre Joye
99041160df
- use php's stream in libmagic
...
- remove duplicate code (like mime_content_type() compatibility function
now use the same base as finfo_file())
- make it portable (works now on windows too, belongs other OSes)
- ([20:28] <lsmith> Pierre: ok please commit)
2008-09-01 18:56:06 +00:00
Felipe Pena
9566ebabcb
- Fixed tests (Disable COMPRESS support for now)
2008-08-29 15:28:45 +00:00
Felix De Vliegher
ef8ae4dfc5
Some fileinfo tests
2008-08-29 10:29:55 +00:00
Scott MacVicar
907c24fd81
Test for fileinfo to check mime types.
2008-08-29 09:52:13 +00:00
Felipe Pena
7208556ca4
- MFH: Fixed check for empty file name
2008-08-27 01:04:23 +00:00
Felipe Pena
d8c43bde79
- MFH: Improved fix
2008-08-26 16:22:27 +00:00
Felipe Pena
727990f432
- MFH: Added check for empty file name
2008-08-26 15:06:28 +00:00