Commit Graph

121 Commits

Author SHA1 Message Date
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
Xinchen Hui
f13b0ede07 Fixed warning implicit declaration of function 'file_printedlen' 2012-04-22 19:52:07 +08:00
Xinchen Hui
c06e92a533 Fixed bug #61812 (Uninitialised value used in libmagic) 2012-04-22 19:38:14 +08:00
Anatoliy Belsky
8684fb7fac updated the libmagic.patch 2012-04-02 17:27:23 +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
Anatoliy Belsky
0cdba53aae Fix bug #61565 Fileinfo ext\fileinfo\tests\finfo_file_001.phpt fails 2012-04-02 17:19:09 +02:00
Anatoliy Belsky
11f04c3524 Bug 61504 updated libmagic.patch 2012-03-28 12:06:09 +02:00
Anatoliy Belsky
e7fa402c7c Bug #61504 TSRML_FETCH() must be last 2012-03-28 12:05:20 +02:00
Gustavo André dos Santos Lopes
067603106e Restored the good part of 74ee335 that was just reverted. 2012-03-28 08:43:41 +01:00
Gustavo André dos Santos Lopes
c6e15455a3 Revert "- fix bug #61504, fix build errors on windows and possibly other"
This reverts commit 74ee335e3a.
2012-03-28 08:41:18 +01:00
Pierre Joye
74ee335e3a - fix bug #61504, fix build errors on windows and possibly other 2012-03-28 01:59:41 +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
e4ca0ed09f - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
b6137f4cb1 - Fixed memory leak when calling the Finfo constructor twice 2011-11-23 01:20:49 +00:00
Felipe Pena
72ad61733a - Fix the fix 2011-11-22 15:12:44 +00:00
Felipe Pena
8a4d75fe85 - Fixed possible memory leak in finfo_open() 2011-11-22 15:04:19 +00:00
Xinchen Hui
dc31f1e99e Fixed bug #60094 (C++ comment fails in c89) 2011-10-19 15:08:50 +00:00
Xinchen Hui
1acb5b2b0c Fix warning "implicit declaration of function `vasprintf'" 2011-09-14 02:19:22 +00:00
Xinchen Hui
a60513240f Eliminated compiler's warnings and make static analyzer silent 2011-08-09 05:11:19 +00:00
Xinchen Hui
fa161f96fa Remove unnecessary(no sense) memset and making the static analyzer silent 2011-08-08 16:57:46 +00:00
Felipe Pena
23e438594d - Make usage of new PHP_FE_END macro 2011-07-25 11:42:53 +00:00
Felipe Pena
490b75d170 - Fixed bug #54934 (Unresolved symbol strtoull in HP-UX 11.11) 2011-05-27 23:31:30 +00:00
Hannes Magnusson
7c1a9e37ca Bug#54016 (finfo_file() Cannot determine filetype in archives) 2011-02-14 15:32:02 +00:00
Felipe Pena
914152d6d8 - Year++ 2011-01-01 02:51:27 +00:00
Pierre Joye
ce96fd6b07 - fix #39863, do not accept paths with NULL in them. See http://news.php.net/php.internals/50191, trunk will have the patch later (adding a macro and/or changing (some) APIs. Patch by Rasmus 2010-11-18 15:22:22 +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
Kalle Sommer Nielsen
cb30330800 Merge safe_mode changes into extensions that are in sync in both branches 2010-04-26 23:55:03 +00:00
Mikko Koppanen
0a445f4f08 Update the libmagic.patch to reflect the current situation. Contains a diff against upstream 5.03 2010-01-31 22:54:00 +00:00
Felipe Pena
0d5a318090 - Fixed ZTS build 2009-12-27 18:13:37 +00:00
Mikko Koppanen
1e6695feb7 spprintf the dbname
use VCWD_ACCESS instead of access
2009-12-27 00:43:33 +00:00
Mikko Koppanen
1496161f01 Upgrade bundled libmagic to 5.03 (fixes CDF parsing related issues)
Clean up / remove whitespace differences to make next merge easier
Removed unnecessary files from trunk
2009-12-26 15:00:21 +00:00
Pierre Joye
e0b392f028 - fix #49732, fix crash when timestamp conversion fails 2009-10-01 13:55:16 +00:00
Scott MacVicar
a090cd733a Fix BC break in mime_content_type() 2009-08-11 23:05:13 +00:00
Pierre Joye
68a3c3f952 - add license 2009-06-26 07:24:41 +00:00
Felipe Pena
219c2603bb - MFH: Fixed bug #48578 (Can't build 5.3 on FBSD 4.11) (Rasmus) 2009-06-17 16:20:04 +00:00
Scott MacVicar
2d183dcc1d MFH Update bundled libmagic to 5.03 2009-05-09 20:34:37 +00:00
Scott MacVicar
c48241a569 MFH Update libmagic data file to 5.02 2009-05-04 20:56:13 +00:00
Scott MacVicar
c3b88aec15 MFH Update libmagic to 5.02 2009-05-04 20:54:53 +00:00
Pierre Joye
8e202b40a0 - fix the build for win (vc6 or vc9)
- fix logic in time convertion
- force shared on windows, will fix the dirent issue later (no, it is not enough to simply remove the dep or header include)
- add myself before I forget again
2009-03-16 15:03:06 +00:00
Ilia Alshanetsky
ea27fd2ba3 Fixed compiler warnings 2009-03-16 12:52:39 +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
Andrei Zmievski
d7b6f0103b memset() requires a pointer. 2009-01-12 19:09:34 +00:00
Scott MacVicar
372256b002 MFH Remove all of the stuff we have in here for pre PHP 5.2 support and memset the fileinfo struct. 2008-12-22 16:45:07 +00:00
Derick Rethans
9d1eca8ee1 *** empty log message *** 2008-12-04 14:55:19 +00:00
Scott MacVicar
ceabdbb483 MFH Add asprintf, use regular system malloc and free and add checks in configure.in for the functions 2008-11-27 19:45:27 +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