From: Remi Collet <remi@php.net>
Date: Wed, 18 Mar 2020 13:09:50 +0000 (+0100)
Subject: bump zp to 1.18.1 + doc
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a5f136b8556cdd6ff3b96f976d0f3b6a25052171;p=php

bump zp to 1.18.1 + doc
---

diff --git a/NEWS b/NEWS
index 662dff8105..c05493cc84 100644
--- a/NEWS
+++ b/NEWS
@@ -153,5 +153,7 @@ PHP                                                                        NEWS
     is closed. (Remi)
   . Fixed bug #50678 (files extracted by ZipArchive class lost their
     original modified time). (Remi)
+  . Implemented FR #77960 (add compression / encryption options for
+    ZipArchive::addGlob and ZipArchive::addPattern). (Remi)
 
 <<< NOTE: Insert NEWS from last stable release here prior to actual release! >>>
diff --git a/UPGRADING b/UPGRADING
index ac35b36c6c..1467d311ad 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -450,7 +450,7 @@ PHP 8.0 UPGRADE NOTES
     RFC: https://wiki.php.net/rfc/dom_living_standard_api
 
 - Zip:
-  . Extension updated to version 1.18
+  . Extension updated to version 1.18.1
   . New ZipArchive::lastId property to get index value of last added entry.
   . Error can be checked after an archive is closed using ZipArchive::status,
     ZipArchive::statusSys properties or ZipArchive::getStatusString() method.
@@ -475,8 +475,13 @@ PHP 8.0 UPGRADE NOTES
 ========================================
 
 - Zip
- . ZipArchive::addGlob and ZipArchive::addPattern methods accept a "flags"
-   value in the "options" array argument.
+ . ZipArchive::addGlob and ZipArchive::addPattern methods accept more
+   values in the "options" array argument:
+   . flags
+   . comp_method
+   . comp_flags
+   . env_method
+   . enc_pasword
  . ZipArchive::addEmptyDir, ZipArchive::addFile and aZipArchive::addFromString
    methods have a new "flags" argument. This allow to manage name encoding
    (ZipArchive::FL_ENC_*) and entry replacement (ZipArchive::FL_OVERWRITE)
diff --git a/ext/zip/php_zip.h b/ext/zip/php_zip.h
index 1f3ec76f02..60655ead65 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.18.0"
+#define PHP_ZIP_VERSION "1.18.1"
 
 #define ZIP_OPENBASEDIR_CHECKPATH(filename) php_check_open_basedir(filename)