Merge pull request #74 from nextcloud/bugfix/2352/zip64-central-direc…

…tory-length Patch ZipStreamer to fix directory downloads
nextcloud · Jan 10, 2018 · 3cec97e · 3cec97e
2 parents 696f768 + 4ec6dd6
commit 3cec97e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/mcnetic/zipstreamer/src/ZipStreamer.php b/mcnetic/zipstreamer/src/ZipStreamer.php
@@ -525,7 +525,7 @@ private function buildCentralDirectoryHeader($filePath, $timestamp, $gpFlags,
   private function buildEndOfCentralDirectoryRecord($cdRecLength) {
     if ($this->zip64) {
       $diskNumber = -1;
-      $cdRecCount = -1;
+      $cdRecCount = min(sizeof($this->cdRec), 0xffff);
       $cdRecLength = -1;
       $offset = -1;
     } else {

diff --git a/patches.txt b/patches.txt
@@ -6,3 +6,4 @@ Patches:
 - SabreXML: Fix invalid PHP docs https://github.com/fruux/sabre-xml/pull/128
 - php-opencloud: Fix invalid PHP docs https://github.com/rackspace/php-opencloud/pull/711
 - SabreXML: Prevent infinite loops for empty props element https://github.com/fruux/sabre-xml/pull/132
+- ZipStreamer: Fix zip generation for 7zip https://github.com/McNetic/PHPZipStreamer/pull/39