diff options
| author | alecpl <alec@alec.pl> | 2012-04-04 16:41:08 +0000 |
|---|---|---|
| committer | alecpl <alec@alec.pl> | 2012-04-04 16:41:08 +0000 |
| commit | ff2d88a7ab6e3c63550c8a48f6ddf93197540ae0 (patch) | |
| tree | ed93c9872a6b9e0c3fb3bd82cd666b9afe9989aa | |
| parent | d63244ebf44989c32a4c3f240b7f29c50bef9bfc (diff) | |
- Fix bug where memory_limit = -1 wasn't handled properly
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | program/include/main.inc | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -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; } |