hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-12 12:33:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix PHP memory limit check

Browse Source
This commit is contained in:
Romain Neutron
2012-06-12 19:41:14 +02:00
parent 01476c8d48
commit 969fed45d6
1 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/classes/setup.class.php
View File

@@ -524,7 +524,7 @@ class setup
$constraints = array(); $constraints = array();
foreach (self::$PHP_EXT as $ext) { foreach (self::$PHP_EXT as $ext) {
if('pcntl' === $ext && 0 === stripos(strtolower(PHP_OS), 'win')){ if ('pcntl' === $ext && 0 === stripos(strtolower(PHP_OS), 'win')) {
continue; continue;
} }
@@ -618,7 +618,33 @@ class setup
} }
} }
foreach (self::$PHP_CONF as $conf => $value) { foreach (self::$PHP_CONF as $conf => $value) {
if (($tmp = self::test_php_conf($conf, $value)) !== $value) { if ($conf == 'memory_limit') {
$memoryFound = self::test_php_conf($conf, $value);
switch (strtolower(substr($memoryFound, -1))) {
case 'g':
$memoryFound *= 1024;
case 'm':
$memoryFound *= 1024;
case 'k':
$memoryFound *= 1024;
}
$memoryRequired = $value;
switch (strtolower(substr($memoryRequired, -1))) {
case 'g':
$memoryRequired *= 1024;
case 'm':
$memoryRequired *= 1024;
case 'k':
$memoryRequired *= 1024;
}
if ($memoryFound >= $memoryRequired) {
$constraints[] = new Setup_Constraint($conf, true, sprintf('%s = `%s` => OK', $conf, $value), ! in_array($conf, $nonblockers));
} else {
$constraints[] = new Setup_Constraint($conf, false, sprintf('Bad configuration for %1$s, found `%2$s`, required `%3$s`', $conf, $tmp, $value), ! in_array($conf, $nonblockers));
}
} elseif (($tmp = self::test_php_conf($conf, $value)) !== $value) {
$constraints[] = new Setup_Constraint($conf, false, sprintf('Bad configuration for %1$s, found `%2$s`, required `%3$s`', $conf, $tmp, $value), ! in_array($conf, $nonblockers)); $constraints[] = new Setup_Constraint($conf, false, sprintf('Bad configuration for %1$s, found `%2$s`, required `%3$s`', $conf, $tmp, $value), ! in_array($conf, $nonblockers));
} else { } else {
$constraints[] = new Setup_Constraint($conf, true, sprintf('%s = `%s` => OK', $conf, $value), ! in_array($conf, $nonblockers)); $constraints[] = new Setup_Constraint($conf, true, sprintf('%s = `%s` => OK', $conf, $value), ! in_array($conf, $nonblockers));
@@ -742,4 +768,3 @@ class setup
return; return;
} }
} }