summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
authorLonnie Ezell <lonnieje@gmail.com>2020-01-27 22:38:50 +0100
committerGitHub <noreply@github.com>2020-01-27 22:38:50 +0100
commitddfe81730f43b20092383165911c5b1c92d4e5f3 (patch)
treedc475f9ee1cb4e3b19daae77e7fc2bd261484288 /system/libraries
parente7c36079d6885ee9bd25f8cae70f0049d46b9d60 (diff)
parent1ca5718fc6c02a89c194d6482f23e41c193bfd33 (diff)
Merge pull request #5893 from aitorres/develop
ZIP Library Memory Optimization
Diffstat (limited to 'system/libraries')
-rw-r--r--system/libraries/Zip.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/system/libraries/Zip.php b/system/libraries/Zip.php
index 094f4c802..5fba1cf3a 100644
--- a/system/libraries/Zip.php
+++ b/system/libraries/Zip.php
@@ -406,13 +406,13 @@ class CI_Zip {
return FALSE;
}
- return $this->zipdata
- .$this->directory."\x50\x4b\x05\x06\x00\x00\x00\x00"
+ $footer = $this->directory."\x50\x4b\x05\x06\x00\x00\x00\x00"
.pack('v', $this->entries) // total # of entries "on this disk"
.pack('v', $this->entries) // total # of entries overall
.pack('V', self::strlen($this->directory)) // size of central dir
.pack('V', self::strlen($this->zipdata)) // offset to start of central dir
."\x00\x00"; // .zip file comment length
+ return $this->zipdata . $footer;
}
// --------------------------------------------------------------------