summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-01-13 21:35:47 -0800
committerBrion Vibber <brion@pobox.com>2010-01-13 21:35:47 -0800
commite8abb0c2ed7219dbcca4e879db36584c3d026bc0 (patch)
tree6ff2975cf33b5d221aa5c165f4b6be232209e9ab
parentcb962ed4755f213042f72580180908033ef3276e (diff)
fix for non-% memory soft limit
-rw-r--r--lib/iomaster.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/iomaster.php b/lib/iomaster.php
index aff5b145c..5d1071a39 100644
--- a/lib/iomaster.php
+++ b/lib/iomaster.php
@@ -231,7 +231,7 @@ class IoMaster
return -1;
}
} else {
- return $this->parseMemoryLimit($limit);
+ return $this->parseMemoryLimit($softLimit);
}
return $softLimit;
}