1
0
mirror of https://github.com/php/php-src.git synced 2026-04-21 06:51:18 +02:00
Commit Graph

11 Commits

Author SHA1 Message Date
Mikko Koppanen
24af48e402 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
dae424147c Update libmagic to 5.02 2009-05-04 20:52:43 +00:00
Pierre Joye
b72606c92f - 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:02:44 +00:00
Scott MacVicar
daf4211e0b Update fileinfo to libmagic 5.00 and remove dependency on dirent.h on Windows 2009-03-15 23:02:35 +00:00
Scott MacVicar
881c30db88 Update libmagic to 4.26 and add support for v6 of the magic file format. 2008-11-02 16:09:27 +00:00
Ilia Alshanetsky
9219be30f4 MFB: removed dead-code 2008-10-15 22:57:22 +00:00
Felipe Pena
ac3ae236ec - MFB:
- 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)

  - 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-07 20:29:54 +00:00
Derick Rethans
07633881bd - Some more cleanups, and fixed some warnings. 2008-08-29 12:05:35 +00:00
Scott MacVicar
83abc6c537 MFB: Replace ereg code with pcre, fix duplicate macro names and segfault. Patch by Mikko 2008-08-29 09:50:57 +00:00
Ilia Alshanetsky
caa3217c68 MFB:
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:24:12 +00:00
Derick Rethans
74947e562e - Move lib to libmagic 2008-07-11 14:13:50 +00:00