Skip to content

Commit 5b2f677

Browse files
committed
composer.json: Change branch alias to 1.x-dev
1 parent 4932e97 commit 5b2f677

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
},
3939
"extra": {
4040
"branch-alias": {
41-
"dev-master": "1.1-dev"
41+
"dev-master": "1.x-dev"
4242
}
4343
}
4444
}

src/MultipartStreamBuilder.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -392,6 +392,10 @@ public function setBufferMaxMemory(int $size): MultipartStreamBuilder
392392
protected static function getAvailableMemory(): int
393393
{
394394
$memory_limit = ini_get('memory_limit');
395+
if ($memory_limit === '-1') {
396+
// If there is no memory limit, return 100MB by default.
397+
return 100 * 1024 * 1024;
398+
}
395399
if (!preg_match('/^(\d+)(G|M|K|)$/', $memory_limit, $matches)) {
396400
throw new \Exception("Unknown memory_limit format: {$memory_limit}");
397401
}

0 commit comments

Comments
 (0)