import v1.1.0_RC2 | 2009-09-20

This commit is contained in:
2019-07-17 22:19:00 +02:00
parent 3b7ba80568
commit 38c146901c
2504 changed files with 101817 additions and 62316 deletions

View File

@ -13,8 +13,9 @@
* to license@zend.com so we can send you a copy immediately.
*
* @package Zend_Memory
* @copyright Copyright (c) 2005-2008 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id: Manager.php 16971 2009-07-22 18:05:45Z mikaelkael $
*/
/** Zend_Memory_Container_Movable */
@ -36,7 +37,7 @@ require_once 'Zend/Memory/AccessController.php';
*
* @category Zend
* @package Zend_Memory
* @copyright Copyright (c) 2005-2008 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Memory_Manager
@ -166,7 +167,7 @@ class Zend_Memory_Manager
$this->_generateMemManagerId();
$memoryLimitStr = trim(ini_get('memory_limit'));
if ($memoryLimitStr != '') {
if ($memoryLimitStr != '' && $memoryLimitStr != -1) {
$this->_memoryLimit = (integer)$memoryLimitStr;
switch (strtolower($memoryLimitStr[strlen($memoryLimitStr)-1])) {
case 'g':