diff options
| author | Remi Collet <remi@remirepo.net> | 2020-11-05 17:13:39 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2020-11-06 09:58:05 +0100 |
| commit | 8d7ca472e50466e2756078592e444ea19da8807a (patch) | |
| tree | ef45510f9cafe5e81dd096887c398f25a921f58d /ext/zip/php_zip.c | |
| parent | 2d894916c532f3d7a17cdb5283cbdc9f85333801 (diff) | |
| download | php-git-8d7ca472e50466e2756078592e444ea19da8807a.tar.gz | |
only display libzip both headers/library versions if they differ
Diffstat (limited to 'ext/zip/php_zip.c')
| -rw-r--r-- | ext/zip/php_zip.c | 11 |
1 files changed, 7 insertions, 4 deletions
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"); |