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:41:42 -0800
commit4b839cfc53d1aa5aa64adb940e122efe1475c9e9 (patch)
tree454a5bb6760cde1c479db8a2fb4fddac91df1201
parentb25deaacea75f2e565a58ea14aca19627f5cfa93 (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;
}