diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c index 58707d6f952..92272d270fe 100644 --- a/ext/zip/php_zip.c +++ b/ext/zip/php_zip.c @@ -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",