diff options
| author | Remi Collet <remi@php.net> | 2017-12-19 14:46:32 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2017-12-19 14:46:32 +0100 |
| commit | c21ec44b214119479879222424a598210bb42775 (patch) | |
| tree | 3306d70b43a88b5e670a52d5daf08e7c9eba80f5 /ext | |
| parent | a1d2bf831f22f0f583ea9aa7c18b3a257b907396 (diff) | |
| download | php-git-c21ec44b214119479879222424a598210bb42775.tar.gz | |
display headers (buildtime) and library (runtime) versions in phpinfo (libzip >= 1.3.1)
Diffstat (limited to 'ext')
| -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 7ae43250c0..dc34cbf694 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 92a5c036b4..3da018d97e 100644 --- a/ext/zip/php_zip.c +++ b/ext/zip/php_zip.c @@ -3304,7 +3304,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 585309789e..ab412f95e1 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) |