From ff2d88a7ab6e3c63550c8a48f6ddf93197540ae0 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 04 Apr 2012 12:41:08 -0400
Subject: [PATCH] - Fix bug where memory_limit = -1 wasn't handled properly
---
CHANGELOG | 1 +
program/include/main.inc | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 9083dbb..5808e73 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 ecb46ab..51a65b5 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -1611,7 +1611,7 @@
$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;
}
--
Gitblit v1.9.1