Anatol Belski
c06f66563a
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
removed dead code
Conflicts:
ext/fileinfo/libmagic/readelf.c
ext/fileinfo/libmagic/readelf.h
2015-01-04 09:42:46 +01:00
Remi Collet
919abf0cb1
removed dead code
2015-01-04 09:40:19 +01:00
Anatol Belski
967a6771d3
updated to libmagic-5.17
2014-02-19 10:02:36 +01:00
Remi Collet
89f864c547
Fixed Bug #66731 file: infinite recursion
...
Upstream commit (available in file-5.17)
3c081560c2cc9e74dfec
2014-02-18 13:54:33 +01:00
Anatol Belski
10367fa7c6
upgraded libmagic to 5.14
2013-04-07 22:15:56 +02:00
Xinchen Hui
f13b0ede07
Fixed warning implicit declaration of function 'file_printedlen'
2012-04-22 19:52:07 +08: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
12cf930a40
Fix bug #61504 , potential vuln. in fileinfo. update to 5.11
2012-03-27 13:34:46 +02: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
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
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
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
Ilia Alshanetsky
5a28412ad2
Removed dead-code
2008-10-15 22:56:57 +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
Derick Rethans
6fbf14c544
- MFH: Some more cleanups, and fixed some warnings.
2008-08-29 12:05:46 +00:00
Scott MacVicar
4690692519
Replace ereg code with pcre, fix duplicate macro names and segfault. Patch by Mikko
2008-08-29 09:49:01 +00:00
Ilia Alshanetsky
b805c7f8b7
Upgraded the lib to use PHP memory allocation routines.
...
Fixed a crash caused by analysis of DEADJOE files
A little bit of CS inside libmagic
2008-08-26 12:23:29 +00:00
SVN Migration
14ce4a1d0a
This commit was manufactured by cvs2svn to create branch 'PHP_5_3'.
2008-07-25 02:44:58 +00:00
