From 8d7ca472e50466e2756078592e444ea19da8807a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 5 Nov 2020 17:13:39 +0100 Subject: [PATCH 1/2] only display libzip both headers/library versions if they differ --- ext/zip/php_zip.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c index 96baabacd40..e36975a3be5 100644 --- a/ext/zip/php_zip.c +++ b/ext/zip/php_zip.c @@ -3213,11 +3213,14 @@ 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"); From e2509cf98a6fb5a5af5642a0d37effb68c432a6c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 5 Nov 2020 17:18:22 +0100 Subject: [PATCH 2/2] report about ZSTD compression availability --- ext/zip/php_zip.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c index e36975a3be5..cac33818c7f 100644 --- a/ext/zip/php_zip.c +++ b/ext/zip/php_zip.c @@ -3226,6 +3226,12 @@ static PHP_MINFO_FUNCTION(zip) 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",