Commit 214072 by webchick
#375578 by Aron Novak and alex_b: Only raise max execution time during cron if too low.
--- includes/common.inc 2009/05/20 05:44:02 1.905
+++ includes/common.inc 2009/05/20 06:03:06 1.906
@@ -3032,8 +3032,10 @@
// Allow execution to continue even if the request gets canceled.
@ignore_user_abort(TRUE);
- // Increase the maximum execution time.
- @set_time_limit(240);
+ // Try to increase the maximum execution time if it is too low.
+ if (ini_get('max_execution_time') < 240) {
+ @set_time_limit(240);
+ }
// Fetch the cron semaphore
$semaphore = variable_get('cron_semaphore', FALSE);
+++ includes/common.inc 2009/05/20 06:03:06 1.906
@@ -3032,8 +3032,10 @@
// Allow execution to continue even if the request gets canceled.
@ignore_user_abort(TRUE);
- // Increase the maximum execution time.
- @set_time_limit(240);
+ // Try to increase the maximum execution time if it is too low.
+ if (ini_get('max_execution_time') < 240) {
+ @set_time_limit(240);
+ }
// Fetch the cron semaphore
$semaphore = variable_get('cron_semaphore', FALSE);