mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-25 02:44:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Restored the good part of 74ee335 that was just reverted.

Browse Source
This commit is contained in:
Gustavo André dos Santos Lopes 2012-03-28 08:43:41 +01:00
parent c6e15455a3
commit 067603106e
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/fileinfo/libmagic/magic.c
View File

@ -92,6 +92,7 @@ private const char *file_or_stream(struct magic_set *, const char *, php_stream
#endif
/* XXX this functionality is excluded in php, enable it in apprentice.c:340 */
#if 0
private const char *
get_default_magic(void)
{
@ -215,6 +216,7 @@ magic_getpath(const char *magicfile, int action)
return action == FILE_LOAD ? get_default_magic() : MAGIC;
}
#endif
public struct magic_set *
magic_open(int flags)