diff options
Diffstat (limited to 'ext/fileinfo/fileinfo.c')
| -rw-r--r-- | ext/fileinfo/fileinfo.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ext/fileinfo/fileinfo.c b/ext/fileinfo/fileinfo.c index 5d36a0e949..2f61944ad7 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(); } /* }}} */ @@ -315,11 +321,7 @@ PHP_FUNCTION(finfo_open) file = NULL; } else if (file && *file) { /* user specified file, perform open_basedir checks */ -#if PHP_API_VERSION < 20100412 - if ((PG(safe_mode) && (!php_checkuid(file, NULL, CHECKUID_CHECK_FILE_AND_DIR))) || php_check_open_basedir(file TSRMLS_CC)) { -#else if (php_check_open_basedir(file TSRMLS_CC)) { -#endif FILEINFO_DESTROY_OBJECT(object); RETURN_FALSE; } |