summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2011-12-01 14:52:33 +0100
committerPhil Sturgeon <email@philsturgeon.co.uk>2011-12-01 14:52:33 +0100
commit34d9cd72cab1de6f722f2611f31ac4ab3f420d8b (patch)
tree194c3f78b39eae86c7d7e101fb72dfe11fc6818c /system
parentff30be1c782a853b8c58f520214ac5079f273c42 (diff)
parenteea0cbebc48d156f74c044f9932602d051eb9401 (diff)
Merge pull request #730 from JackWebbHeller/patch-1
Stop CI overriding the set config value for Maximum Execution Time, when running from CLI
Diffstat (limited to 'system')
-rwxr-xr-xsystem/core/CodeIgniter.php8
1 files changed, 6 insertions, 2 deletions
diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php
index 4d76a5587..97527e5ca 100755
--- a/system/core/CodeIgniter.php
+++ b/system/core/CodeIgniter.php
@@ -106,9 +106,13 @@
* Set a liberal script execution time limit
* ------------------------------------------------------
*/
- if (function_exists("set_time_limit") == TRUE AND @ini_get("safe_mode") == 0)
+ if (function_exists("set_time_limit") AND @ini_get("safe_mode") == 0)
{
- @set_time_limit(300);
+ // Do not override the Time Limit value if running from Command Line
+ if(php_sapi_name() != 'cli')
+ {
+ @set_time_limit(300);
+ }
}
/*