diff options
| author | Andrey Andreev <narf@devilix.net> | 2020-01-28 20:16:56 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2020-01-28 20:16:56 +0100 |
| commit | 2b96e73d85365fb05a56e7464cdb341fd5a9d7b8 (patch) | |
| tree | 7e6a7d5805e1a94abe92f7db43727da739877aed /system/libraries/Zip.php | |
| parent | ddfe81730f43b20092383165911c5b1c92d4e5f3 (diff) | |
| parent | ced499f7ad90ff8bb6bf0faa2e24a1593204de9a (diff) | |
Merge branch '3.1-stable' into develop
Conflicts resolved:
.travis.yml
system/database/DB_query_builder.php
system/helpers/captcha_helper.php
system/libraries/Cache/drivers/Cache_redis.php
system/libraries/Zip.php
Diffstat (limited to 'system/libraries/Zip.php')
| -rw-r--r-- | system/libraries/Zip.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/system/libraries/Zip.php b/system/libraries/Zip.php index 5fba1cf3a..4579e8c2b 100644 --- a/system/libraries/Zip.php +++ b/system/libraries/Zip.php @@ -406,13 +406,14 @@ class CI_Zip { return FALSE; } + // @see https://github.com/bcit-ci/CodeIgniter/issues/5864 $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; + return $this->zipdata.$footer; } // -------------------------------------------------------------------- |