diff options
| author | Remi Collet <remi@php.net> | 2017-12-19 14:48:21 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2017-12-19 14:48:21 +0100 |
| commit | 50e8ee128f2ed9dc476bb4dc240b99a883320784 (patch) | |
| tree | 7ef65886b707b89bdcbe9406cd5c4dcca1c0ec83 | |
| parent | 0994e373f21c1b4c63d38975f0c62866f0378113 (diff) | |
| parent | ac4da9a0ede87a437bc75f6135e103e2d3747b09 (diff) | |
| download | php-git-50e8ee128f2ed9dc476bb4dc240b99a883320784.tar.gz | |
Merge branch 'PHP-7.2'
* PHP-7.2:
NEWS
display headers (buildtime) and library (runtime) versions in phpinfo (libzip >= 1.3.1)
| -rw-r--r-- | ext/zip/config.m4 | 8 | ||||
| -rw-r--r-- | ext/zip/php_zip.c | 5 | ||||
| -rw-r--r-- | ext/zip/php_zip.h | 2 |
3 files changed, 14 insertions, 1 deletions
diff --git a/ext/zip/config.m4 b/ext/zip/config.m4 index f928700c80..afca4efc9f 100644 --- a/ext/zip/config.m4 +++ b/ext/zip/config.m4 @@ -109,6 +109,14 @@ if test "$PHP_ZIP" != "no"; then -L$LIBZIP_LIBDIR ]) + PHP_CHECK_LIBRARY(zip, zip_libzip_version, + [ + AC_DEFINE(HAVE_LIBZIP_VERSION, 1, [Libzip >= 1.3.1 with zip_libzip_version function]) + ], [ + ], [ + -L$LIBZIP_LIBDIR + ]) + AC_DEFINE(HAVE_ZIP,1,[ ]) PHP_NEW_EXTENSION(zip, php_zip.c zip_stream.c, $ext_shared,, $LIBZIP_CFLAGS) PHP_SUBST(ZIP_SHARED_LIBADD) diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c index 926aaae7e2..158be1143e 100644 --- a/ext/zip/php_zip.c +++ b/ext/zip/php_zip.c @@ -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(); } diff --git a/ext/zip/php_zip.h b/ext/zip/php_zip.h index bc41502182..108abe4e9b 100644 --- a/ext/zip/php_zip.h +++ b/ext/zip/php_zip.h @@ -37,7 +37,7 @@ extern zend_module_entry zip_module_entry; #define ZIP_OVERWRITE ZIP_TRUNCATE #endif -#define PHP_ZIP_VERSION "1.15.1" +#define PHP_ZIP_VERSION "1.15.2" #define ZIP_OPENBASEDIR_CHECKPATH(filename) php_check_open_basedir(filename) |