diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-05-23 19:24:14 +0200 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-05-23 19:24:14 +0200 |
| commit | 82741441c22c94b695cc0d6aba747d34bca25c1c (patch) | |
| tree | dc44d2a4c756d6a7643185990c3da4983d6c3bd7 /system/core | |
| parent | 3046c9fdc764fd68b855b09e1600e22ecc62a47b (diff) | |
| parent | 7d22f0adbe5df5c93ae1ee367acad7568d555f0a (diff) | |
Merge pull request #1367 from PawelDecowski/develop
Remove set_time_limit() call. Fixes #1346
Diffstat (limited to 'system/core')
| -rwxr-xr-x | system/core/CodeIgniter.php | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php index 585bb7b31..c8245fcfa 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... * ------------------------------------------------------ */ |