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

Jump to bottom

Check required PHP options and mute error of ini_set #376

Merged
merged 4 commits into from
Dec 22, 2016
Merged

Check required PHP options and mute error of ini_set #376

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
90d29c3
[TASK] Set max_execution_time only if it's not '0'
t3easy Dec 16, 2016
b4249f5
[BUGFIX] Check required PHP options and mute error of ini_set
t3easy Dec 20, 2016
330e36e
Merge branch 'master' into max_execution_time
helhum Dec 22, 2016
016d98c
Remove echo in early bootstrap
helhum Dec 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions Classes/Core/ConsoleBootstrap.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,12 @@ protected function ensureRequiredEnvironment()
echo 'The command line must be executed with a cli PHP binary! The current PHP sapi type is "' . PHP_SAPI . '".' . PHP_EOL;
exit(1);
}
ini_set('memory_limit', -1);
set_time_limit(0);
if (ini_get('memory_limit') !== '-1') {
@ini_set('memory_limit', '-1');
}
if (ini_get('max_execution_time') !== '0') {
@ini_set('max_execution_time', '0');
}
}

/**
Expand Down