expose correct libmagic version

diff --git a/ext/fileinfo/fileinfo.c b/ext/fileinfo/fileinfo.c
index 99c394520470d4ddd04c92dd25a5bd104cddf851..2f61944ad764fe04cc1a33f84b00499b223e4f1e 100644 (file)
--- 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 737ec1be1a8446fd63c2b78378adad4e554b4227..0f06814a42276d75ad6decc7a300c84406e4e679 100644 (file)
--- 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 2aea7010cfa404348ee10653e62c1120415e9fc8..a53c6830d8a5dbccca73a44fc85910067785553a 100644 (file)
--- 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$