]> granicus.if.org Git - php/commitdiff
only display libzip both headers/library versions if they differ
authorRemi Collet <remi@remirepo.net>
Thu, 5 Nov 2020 16:13:39 +0000 (17:13 +0100)
committerRemi Collet <remi@php.net>
Fri, 6 Nov 2020 08:58:05 +0000 (09:58 +0100)
ext/zip/php_zip.c

index 96baabacd40fa77b7d5bb779449b5d22eb94872c..e36975a3be5568663ac68e704042796a270e6d86 100644 (file)
@@ -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");