Leave underlying stream open

Author: thekid

ChangeLog.md

@@ -3,6 +3,11 @@ ZIP File support for the XP Framework ChangeLog
 
 ## ?.?.? / ????-??-??
 
+## 11.3.0 / 2025-12-12
+
+* Merged PR #7: Refactor encryption, adding AES-128, -192 and -256 write
+  support
+  (@thekid)
 * Merged PR #6: Support listing entries (with encrypted content) without
   password by deferring verification until content stream is accessed
   (@thekid)

src/main/php/io/archive/zip/ZipArchiveWriter.class.php

@@ -249,7 +249,7 @@ public function close() {
       $l+= strlen($s);
       $this->stream->write($s);
     }
-    
+
     // End of central directory
     $this->stream->write(self::EOCD);
     $this->stream->write(pack(

src/main/php/io/archive/zip/ZipFileOutputStream.class.php

@@ -76,6 +76,10 @@ public function close() {
         $this->name
       );
       $out= $encryption->out($this->writer, $crc32);
+      while ($this->data->available()) {
+        $out->write($this->data->read());
+      }
+      $out->close();
     } else {
       $this->writer->addEntry(
         0,
@@ -87,13 +91,12 @@ public function close() {
         $this->name,
         ''
       );
-      $out= $this->writer->stream;
+      while ($this->data->available()) {
+        $this->writer->stream->write($this->data->read());
+      }
+      // Leave underlying stream open
     }
 
-    while ($this->data->available()) {
-      $out->write($this->data->read());
-    }
-    $out->close();
     $this->data= null;
   }
 }