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

…tory-length-11 [stable11] Patch ZipStreamer to fix directory downloads
nextcloud · Jan 10, 2018 · 9dc2d1d · 9dc2d1d
2 parents 33a028d + 5432273
commit 9dc2d1d
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
@@ -3,3 +3,4 @@ Patches:
 - patchwork/utf8: Remove trigger_error() that spammed the error log
 - Doctrine: fix error handling for not null columns on some mysql servers https://github.com/doctrine/dbal/pull/2422
 - 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