Skip to content

Commit 8d7ca47

Browse files
committed
only display libzip both headers/library versions if they differ
1 parent 2d89491 commit 8d7ca47

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

ext/zip/php_zip.c

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3213,11 +3213,14 @@ static PHP_MINFO_FUNCTION(zip)
32133213
php_info_print_table_row(2, "Zip", "enabled");
32143214
php_info_print_table_row(2, "Zip version", PHP_ZIP_VERSION);
32153215
#ifdef HAVE_LIBZIP_VERSION
3216-
php_info_print_table_row(2, "Libzip headers version", LIBZIP_VERSION);
3217-
php_info_print_table_row(2, "Libzip library version", zip_libzip_version());
3218-
#else
3219-
php_info_print_table_row(2, "Libzip version", LIBZIP_VERSION);
3216+
if (strcmp(LIBZIP_VERSION, zip_libzip_version())) {
3217+
php_info_print_table_row(2, "Libzip headers version", LIBZIP_VERSION);
3218+
php_info_print_table_row(2, "Libzip library version", zip_libzip_version());
3219+
} else
32203220
#endif
3221+
{
3222+
php_info_print_table_row(2, "Libzip version", LIBZIP_VERSION);
3223+
}
32213224
#ifdef HAVE_METHOD_SUPPORTED
32223225
php_info_print_table_row(2, "BZIP2 compression",
32233226
zip_compression_method_supported(ZIP_CM_BZIP2, 1) ? "Yes" : "No");

0 commit comments

Comments
 (0)