zip extension version 1.22.1

- add ZipArchive::FL_OPEN_FILE_NOW to open the file when added
  instead of waiting for archive to be closed

Author: remicollet

UPGRADING

@@ -314,6 +314,7 @@ PHP 8.3 UPGRADE NOTES
   . ZipArchive::AFL_IS_TORRENTZIP (libzip >= 1.10)
   . ZipArchive::AFL_WANT_TORRENTZIP (libzip >= 1.10)
   . ZipArchive::AFL_CREATE_OR_KEEP_FILE_FOR_EMPTY_ARCHIVE (libzip >= 1.10)
+  . ZipArchive::FL_OPEN_FILE_NOW
 
 ========================================
 11. Changes to INI File Handling

ext/zip/php_zip.c

@@ -299,7 +299,17 @@ static int php_zip_add_file(ze_zip_object *obj, const char *filename, size_t fil
 		return -1;
 	}
 
-	zs = zip_source_file(obj->za, resolved_path, offset_start, offset_len);
+	if (flags & ZIP_FL_OPEN_FILE_NOW) {
+		FILE *fd;
+		fd = fopen(resolved_path, "rb");
+		if (!fd) {
+			return -1;
+		}
+		flags ^= ZIP_FL_OPEN_FILE_NOW;
+		zs = zip_source_filep(obj->za, fd, offset_start, offset_len);
+	} else {
+		zs = zip_source_file(obj->za, resolved_path, offset_start, offset_len);
+	}
 	if (!zs) {
 		return -1;
 	}

ext/zip/php_zip.h

@@ -31,7 +31,10 @@ extern zend_module_entry zip_module_entry;
 #define ZIP_OVERWRITE ZIP_TRUNCATE
 #endif
 
-#define PHP_ZIP_VERSION "1.22.0"
+/* Additionnal flags not from libzip */
+#define ZIP_FL_OPEN_FILE_NOW (1u<<30)
+
+#define PHP_ZIP_VERSION "1.22.1"
 
 #ifdef HAVE_LIBZIP_VERSION
 #define LIBZIP_VERSION_STR zip_libzip_version()

ext/zip/php_zip.stub.php

@@ -172,6 +172,13 @@ class ZipArchive implements Countable
      */
     public const FL_ENC_CP437 = UNKNOWN;
 
+    /**
+     * Additionnal flags not from libzip
+     * @var int
+     * @cvalue ZIP_FL_OPEN_FILE_NOW
+     */
+    public const FL_OPEN_FILE_NOW = UNKNOWN;
+
     /**
      * @var int
      * @cvalue ZIP_CM_DEFAULT

ext/zip/php_zip_arginfo.h

@@ -24,14 +24,29 @@ if (!$zip->addFile($dirname . 'utils.inc', 'mini.txt', 12, 34)) {
     echo "failed\n";
 }
 var_dump($zip->lastId);
+if (!$zip->addFile($dirname . 'utils.inc', 'other.txt', 0, 0, ZipArchive::FL_OPEN_FILE_NOW)) {
+    echo "failed\n";
+}
+var_dump($zip->lastId);
+$del = $dirname . '__tmp_oo_addfile.txt';
+file_put_contents($del, 'foo');
+if (!$zip->addFile($del, 'deleted.txt', 0, 0, ZipArchive::FL_OPEN_FILE_NOW)) {
+    echo "failed\n";
+}
+if (substr(PHP_OS, 0, 3) != 'WIN') {
+	unlink($del);
+}
+var_dump($zip->lastId);
 if ($zip->status == ZIPARCHIVE::ER_OK) {
     if (!verify_entries($zip, [
         "bar",
         "foobar/",
         "foobar/baz",
         "entry1.txt",
         "test.php",
-        "mini.txt"
+        "mini.txt",
+        "other.txt",
+        "deleted.txt"
     ])) {
         echo "failed\n";
     } else {
@@ -46,12 +61,19 @@ if (!$zip->open($file)) {
 }
 var_dump(strlen($zip->getFromName('test.php')) == filesize($dirname . 'utils.inc'));
 var_dump(strlen($zip->getFromName('mini.txt')) == 34);
+var_dump(strlen($zip->getFromName('other.txt')) == filesize($dirname . 'utils.inc'));
+var_dump($zip->getFromName('deleted.txt') === "foo");
 @unlink($file);
+@unlink($del);
 ?>
 --EXPECT--
 int(-1)
 int(4)
 int(5)
+int(6)
+int(7)
 OK
 bool(true)
 bool(true)
+bool(true)
+bool(true)