com php-src: expose correct libmagic version: ext/fileinfo/fileinfo.c ext/fileinfo/libmagic/magic.h ext/fileinfo/libmagic/patchlevel.h

Commit: 6d2cf0f2a4afcd1f392aadc6178318dacef05c82 Author: Anatol Belski <ab@php.net> Wed, 19 Feb 2014 10:48:52 +0100 Parents: 4019531748aa438f896948231deba4a0764c453b Branches: PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6d2cf0f2a4afcd1f392aadc6178318dacef05c82 Log: expose correct libmagic version Changed paths: M ext/fileinfo/fileinfo.c M ext/fileinfo/libmagic/magic.h M ext/fileinfo/libmagic/patchlevel.h Diff: diff --git a/ext/fileinfo/fileinfo.c b/ext/fileinfo/fileinfo.c index 99c3945..2f61944 100644 --- a/ext/fileinfo/fileinfo.c +++ b/ext/fileinfo/fileinfo..c @@ -269,9 +269,15 @@ ZEND_GET_MODULE(fileinfo) */ PHP_MINFO_FUNCTION(fileinfo) { + char magic_ver[5]; + + (void)snprintf(magic_ver, 4, "%d", magic_version()); + magic_ver[4] = '\0'; + php_info_print_table_start(); php_info_print_table_row(2, "fileinfo support", "enabled"); php_info_print_table_row(2, "version", PHP_FILEINFO_VERSION); + php_info_print_table_row(2, "libmagic", magic_ver); php_info_print_table_end(); } /* }}} */ diff --git a/ext/fileinfo/libmagic/magic.h b/ext/fileinfo/libmagic/magic.h index 737ec1b..0f06814 100644 --- a/ext/fileinfo/libmagic/magic.h +++ b/ext/fileinfo/libmagic/magic.h @@ -75,7 +75,7 @@ #define MAGIC_NO_CHECK_FORTRAN 0x000000 /* Don't check ascii/fortran */ #define MAGIC_NO_CHECK_TROFF 0x000000 /* Don't check ascii/troff */ -#define MAGIC_VERSION 516 /* This implementation */ +#define MAGIC_VERSION 517 /* This implementation */ #ifdef __cplusplus diff --git a/ext/fileinfo/libmagic/patchlevel.h b/ext/fileinfo/libmagic/patchlevel.h index 2aea701..a53c683 100644 --- a/ext/fileinfo/libmagic/patchlevel.h +++ b/ext/fileinfo/libmagic/patchlevel.h @@ -6,7 +6,7 @@ * $File: patchlevel.h,v 1.68 2008/03/22 21:39:43 christos Exp $ * * $Log$ - * Revision 1.7 2014/02/18 22:27:12 ab + * Revision 1.8 2014/02/18 22:27:12 ab * Update libmagic to 5.17 * * $Log$