php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-01 05:02:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.0'

Browse Source 
* PHP-8.0:
  report about ZSTD compression availability
  only display libzip both headers/library versions if they differ
This commit is contained in:
Remi Collet
2020-11-06 09:59:47 +01:00
parent 9bdf2212cc e2509cf98a
commit ca5c8c3ffd
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ext/zip/php_zip.c
View File

@@ -3217,16 +3217,25 @@ static PHP_MINFO_FUNCTION(zip)
php_info_print_table_row(2, "Zip", "enabled");
php_info_print_table_row(2, "Zip version", PHP_ZIP_VERSION);
#ifdef HAVE_LIBZIP_VERSION
php_info_print_table_row(2, "Libzip headers version", LIBZIP_VERSION);
php_info_print_table_row(2, "Libzip library version", zip_libzip_version());
#else
php_info_print_table_row(2, "Libzip version", LIBZIP_VERSION);
if (strcmp(LIBZIP_VERSION, zip_libzip_version())) {
php_info_print_table_row(2, "Libzip headers version", LIBZIP_VERSION);
php_info_print_table_row(2, "Libzip library version", zip_libzip_version());
} else
#endif
{
php_info_print_table_row(2, "Libzip version", LIBZIP_VERSION);
}
#ifdef HAVE_METHOD_SUPPORTED
php_info_print_table_row(2, "BZIP2 compression",
zip_compression_method_supported(ZIP_CM_BZIP2, 1) ? "Yes" : "No");
php_info_print_table_row(2, "XZ compression",
zip_compression_method_supported(ZIP_CM_XZ, 1) ? "Yes" : "No");
#ifdef ZIP_CM_ZSTD
php_info_print_table_row(2, "ZSTD compression",
zip_compression_method_supported(ZIP_CM_ZSTD, 1) ? "Yes" : "No");
#else
php_info_print_table_row(2, "ZSTD compression", "No");
#endif
php_info_print_table_row(2, "AES-128 encryption",
zip_encryption_method_supported(ZIP_EM_AES_128, 1) ? "Yes" : "No");
php_info_print_table_row(2, "AES-192 encryption",