summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG1
-rw-r--r--program/include/main.inc2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 9083dbb5c..5808e73e7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
+- Fix bug where memory_limit = -1 wasn't handled properly
- Support LDAP RFC2256's country object class read/write (#1488123)
- Upgraded to jQuery 1.7.2
- Image resize with GD extension (#1488383)
diff --git a/program/include/main.inc b/program/include/main.inc
index ecb46ab25..51a65b505 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -1611,7 +1611,7 @@ function rcmail_mem_check($need)
$mem_limit = parse_bytes(ini_get('memory_limit'));
$memory = function_exists('memory_get_usage') ? memory_get_usage() : 16*1024*1024; // safe value: 16MB
- return $mem_limit && $memory + $need > $mem_limit ? false : true;
+ return $mem_limit > 0 && $memory + $need > $mem_limit ? false : true;
}