diff options
Diffstat (limited to 'program')
| -rwxr-xr-x | program/include/iniset.php | 7 | ||||
| -rw-r--r-- | program/steps/mail/get.inc | 4 |
2 files changed, 2 insertions, 9 deletions
diff --git a/program/include/iniset.php b/program/include/iniset.php index a58845366..1332c8d0e 100755 --- a/program/include/iniset.php +++ b/program/include/iniset.php @@ -59,15 +59,10 @@ if (isset($_SERVER['HTTPS'])) { ini_set('session.name', 'roundcube_sessid'); ini_set('session.use_cookies', 1); ini_set('session.use_only_cookies', 1); -if (function_exists('set_magic_quotes_runtime')) { - set_magic_quotes_runtime(0); -} // increase maximum execution time for php scripts // (does not work in safe mode) -if (!ini_get('safe_mode')) { - set_time_limit(120); -} +@set_time_limit(120); // set internal encoding for mbstring extension if(extension_loaded('mbstring')) diff --git a/program/steps/mail/get.inc b/program/steps/mail/get.inc index 40ce14e09..cb938c08b 100644 --- a/program/steps/mail/get.inc +++ b/program/steps/mail/get.inc @@ -93,9 +93,7 @@ else if ($pid = get_input_value('_part', RCUBE_INPUT_GET)) { } else { // don't kill the connection if download takes more than 30 sec. - if (!ini_get('safe_mode')) { - set_time_limit(0); - } + @set_time_limit(0); $filename = $part->filename ? $part->filename : ($MESSAGE->subject ? $MESSAGE->subject : 'roundcube') . '.'.$ctype_secondary; |