Merge branch 'PHP-7.2'

* PHP-7.2:
  NEWS
  display headers (buildtime) and library (runtime) versions in phpinfo (libzip >= 1.3.1)
This commit is contained in:
Remi Collet 2017-12-19 14:48:21 +01:00
commit 50e8ee128f
3 changed files with 14 additions and 1 deletions

View file

@ -3313,7 +3313,12 @@ static PHP_MINFO_FUNCTION(zip)
php_info_print_table_row(2, "Zip", "enabled");
php_info_print_table_row(2, "Zip version", PHP_ZIP_VERSION);
#if 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);
#endif
php_info_print_table_end();
}