Changeset ff2d88a in github

Timestamp:

Apr 4, 2012 12:41:08 PM (15 months ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.8

Children:

0cd919b

Parents:

d63244e

Message:

• Fix bug where memory_limit = -1 wasn't handled properly

Files:

• CHANGELOG (modified) (1 diff)
• program/include/main.inc (modified) (1 diff)

CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- 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

program/include/main.inc

@@ -1612 +1612 @@
   $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;
 }