summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPawel Decowski <pawel.decowski@gmail.com>2012-05-17 15:06:25 +0200
committerPawel Decowski <pawel.decowski@gmail.com>2012-05-17 15:06:25 +0200
commit7d22f0adbe5df5c93ae1ee367acad7568d555f0a (patch)
tree939d073c74d7d4c28fb0ccbd529995c1934a368a
parente30b3f7afafa2c016cf78cc8bb8a457c2dbcda8c (diff)
Remove set_time_limit() call. CodeIgniter should respect php.ini setting.
-rwxr-xr-xsystem/core/CodeIgniter.php11
1 files changed, 0 insertions, 11 deletions
diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php
index 00db6e13a..e1892ee7e 100755
--- a/system/core/CodeIgniter.php
+++ b/system/core/CodeIgniter.php
@@ -101,17 +101,6 @@
/*
* ------------------------------------------------------
- * Set a liberal script execution time limit
- * ------------------------------------------------------
- */
- if (function_exists('set_time_limit') && @ini_get('safe_mode') == 0
- && php_sapi_name() !== 'cli') // Do not override the Time Limit value if running from Command Line
- {
- @set_time_limit(300);
- }
-
-/*
- * ------------------------------------------------------
* Start the timer... tick tock tick tock...
* ------------------------------------------------------
*/