summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
authorLonnie Ezell <lonnieje@gmail.com>2020-01-27 22:38:50 +0100
committerAndrey Andreev <narf@devilix.net>2020-01-28 20:10:12 +0100
commit797cd3d25a5411bef7eea9d3b8c38c567bc4635b (patch)
tree88065acec8227a6707421a0e24bfce4b1c1ddaec /system/libraries
parentb3c3bff136bd7db1e96dffa2a6ec7d03b4b8c7a5 (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 c0a14023d..44f73aead 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;
}
// --------------------------------------------------------------------