From 8d7ca472e50466e2756078592e444ea19da8807a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 5 Nov 2020 17:13:39 +0100 Subject: only display libzip both headers/library versions if they differ --- ext/zip/php_zip.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'ext/zip/php_zip.c') diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c index 96baabacd4..e36975a3be 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"); -- cgit v1.2.1