Fixing handling of empty memory_limit for PHP without memory_limit (mostly Windows binaries)- fixed typo

2004-11-20 10:37:03 +00:00
parent 609cba70d2
commit 4b8980fc83
1 changed files with 12 additions and 2 deletions
@@ -3344,9 +3344,19 @@ function raise_memory_limit ($newlimit) {
        return false;
    }
    
-    $cur = return_bytes(@ini_get('memory_limit'));
-    $new = return_bytes($newlimit);
+    $cur = @ini_get('memory_limit');
+    if (empty($cur)) {
+        // if php is compiled without --enable-memory-limits
+        // apparently memory_limit is set to ''
+        $cur=0;
+    } else {
+        if ($cur == -1){
+            return true; // unlimited mem!
+        }
+      $cur = return_bytes($cur);
+    }
    
+    $new = return_bytes($newlimit);
    if ($new > $cur) {
        ini_set('memory_limit', $newlimit);
        return true;