Author: sevein
Date: Tue Jun 14 16:53:56 2011
New Revision: 9162
Log:
Avoid phing setting a new memory_limit value, fixes issue 1627
Modified:
trunk/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/Phing.php
Modified:
trunk/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/Phing.php
==============================================================================
--- trunk/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/Phing.php
Tue Jun 14 11:03:05 2011 (r9161)
+++ trunk/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/Phing.php
Tue Jun 14 16:53:56 2011 (r9162)
@@ -1251,6 +1251,8 @@
self::$origIniSettings['allow_call_time_pass_reference'] =
ini_set('allow_call_time_pass_reference', 'on');
self::$origIniSettings['track_errors'] =
ini_set('track_errors', 1);
+
+ /* See
*http://code.google.com/p/qubit-toolkit/issues/detail?id=1627
// should return memory limit in MB
$mem_limit = (int) ini_get('memory_limit');
if ($mem_limit < 32) {
@@ -1258,6 +1260,7 @@
// this after shutdown (we don't trust the
effectiveness of PHP's garbage collection).
ini_set('memory_limit', '32M'); // nore: this may need
to be higher for many projects
}
+ */
}
/**
--
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/qubit-commits?hl=en.
