tyler.durden
/
icingaweb2-module-director
mirror of https://github.com/Icinga/icingaweb2-module-director.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MemoryLimit: rewrite for PHP 7.1+ 

fixes #1222
This commit is contained in:
Thomas Gelf 2017-10-10 14:52:15 +02:00
parent 717669ed4a
commit c9c59b3f03
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
library/Director/Application/MemoryLimit.php
View File

@ -33,9 +33,10 @@ class MemoryLimit
public static function parsePhpIniByteString($string) public static function parsePhpIniByteString($string)
{ {
$val = trim($string); $val = trim($string);
$last = strtoupper(substr($val, -1, 1));
switch ($last) { if (preg_match('/^(\d+)([KMG])$/', $val, $m)) {
$val = $m[1];
switch ($m[2]) {
case 'G': case 'G':
$val *= 1024; $val *= 1024;
// Intentional fall-through // Intentional fall-through
@ -45,6 +46,7 @@ class MemoryLimit
case 'K': case 'K':
$val *= 1024; $val *= 1024;
} }
}
return intval($val); return intval($val);
} }