summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRemi Collet <remi@php.net>2020-01-31 09:10:10 +0100
committerRemi Collet <remi@php.net>2020-01-31 09:10:10 +0100
commitb915d68852625b5d67443013f8282764b9cf89f3 (patch)
treefa7a3180b8ca9e1c8977db26ec2ffc95b82fa881
parent3af1cee8840a1ccaca90a4392f79510274f84450 (diff)
downloadphp-git-b915d68852625b5d67443013f8282764b9cf89f3.tar.gz
Zip: version is now 1.17.0
change for Windows (which have libzip 1.4 by default) update NEWS
-rw-r--r--NEWS4
-rw-r--r--ext/zip/config.w322
-rw-r--r--ext/zip/php_zip.h2
3 files changed, 5 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index a0147141c5..a41a74acc4 100644
--- a/NEWS
+++ b/NEWS
@@ -120,6 +120,8 @@ PHP NEWS
- Zip:
. Fixed bug #72374 (remove_path strips first char of filename). (tyage)
- . Add ZipArchive::setMtimeName and ZipArchive::setMtimeIndex methods
+ . Add ZipArchive::setMtimeName and ZipArchive::setMtimeIndex methods. (Remi)
+ . Add ZipArchive::setProgressCallback method (since libzip 1.3.0). (Remi)
+ . Add ZipArchive::setCancelCallback method (since libzip 1.6.0). (Remi)
<<< NOTE: Insert NEWS from last stable release here prior to actual release! >>>
diff --git a/ext/zip/config.w32 b/ext/zip/config.w32
index f27b047b2f..ab7742e227 100644
--- a/ext/zip/config.w32
+++ b/ext/zip/config.w32
@@ -15,7 +15,7 @@ if (PHP_ZIP != "no") {
}
AC_DEFINE('HAVE_ZIP', 1);
- ADD_FLAG("CFLAGS_ZIP", "/D _WIN32 /D HAVE_SET_MTIME /D HAVE_ENCRYPTION /D HAVE_LIBZIP_VERSION");
+ ADD_FLAG("CFLAGS_ZIP", "/D _WIN32 /D HAVE_SET_MTIME /D HAVE_ENCRYPTION /D HAVE_LIBZIP_VERSION /D HAVE_PROGRESS_CALLBACK");
} else {
WARNING("zip not enabled; libraries and headers not found");
}
diff --git a/ext/zip/php_zip.h b/ext/zip/php_zip.h
index b6617e81fb..c0969292a8 100644
--- a/ext/zip/php_zip.h
+++ b/ext/zip/php_zip.h
@@ -31,7 +31,7 @@ extern zend_module_entry zip_module_entry;
#define ZIP_OVERWRITE ZIP_TRUNCATE
#endif
-#define PHP_ZIP_VERSION "1.16.1"
+#define PHP_ZIP_VERSION "1.17.0"
#define ZIP_OPENBASEDIR_CHECKPATH(filename) php_check_open_basedir(filename)