Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix TypeError on large folder downloads #27562

Closed
wants to merge 2 commits into from
Closed

Fix TypeError on large folder downloads #27562

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e453ff
Rework how archive type (ZIP or TAR) is chosen.
j-be Jun 18, 2021
2b351aa
Prefer TAR for Linux'user agents.
j-be Jun 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions lib/private/Streamer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

class Streamer {
// array of regexp. Matching user agents will get tar instead of zip
private $preferTarFor = [ '/macintosh|mac os x/i' ];
private $preferTarFor = [ '/macintosh|mac os x|linux/i' ];

// streamer instance
private $streamerInstance;
Expand Down Expand Up @@ -81,12 +81,20 @@ public function __construct(IRequest $request, int $size, int $numberOfFiles) {
* from not fully scanned external storage. And then things fall apart
* if somebody tries to package to much.
*/
if ($size > 0 && $size < 4 * 1000 * 1000 * 1000 && $numberOfFiles < 65536) {
$this->streamerInstance = new ZipStreamer(['zip64' => false]);
} elseif ($request->isUserAgent($this->preferTarFor)) {

// Use TAR no matter what if that is preferred for the current user agent
if ($request->isUserAgent($this->preferTarFor)) {
$this->streamerInstance = new TarStreamer();
// Zip32 as default if size and numberOfFiles allow it
} elseif ($size > 0 && $size < 4 * 1000 * 1000 * 1000 && $numberOfFiles < 65536) {
$this->streamerInstance = new ZipStreamer(['zip64' => false]);
// TODO: Depending on Zip64 support - not sure how one would correctly determine that
} else {
$this->streamerInstance = new ZipStreamer(['zip64' => PHP_INT_SIZE !== 4]);
if (PHP_INT_SIZE !== 4) {
$this->streamerInstance = new ZipStreamer(['zip64' => true]);
} else {
$this->streamerInstance = new TarStreamer();
}
}
}

Expand Down