diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-09-22 07:50:32 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-09-22 07:50:32 +0000 |
| commit | 9a54c678970d220a1eeafe2c690f94f1d6d91fbf (patch) | |
| tree | 1797ba3ca9e2443b212a897eebbbfd2e74292b81 | |
| parent | 993131d4c1ae60d5743c850d716cb8f14f43e41c (diff) | |
- remove set_magic_quotes_runtime() call, use set_time_limit() with @ (#1486149)
git-svn-id: https://svn.roundcube.net/trunk@2979 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/.htaccess | 7 | ||||
| -rwxr-xr-x | roundcubemail/program/include/iniset.php | 7 | ||||
| -rw-r--r-- | roundcubemail/program/steps/mail/get.inc | 4 |
3 files changed, 6 insertions, 12 deletions
diff --git a/roundcubemail/.htaccess b/roundcubemail/.htaccess index 73b740f93..00e1bf2db 100644 --- a/roundcubemail/.htaccess +++ b/roundcubemail/.htaccess @@ -10,9 +10,10 @@ php_value upload_max_filesize 5M php_value post_max_size 6M php_value memory_limit 64M -php_value zlib.output_compression Off -php_value magic_quotes_gpc 0 -php_value zend.ze1_compatibility_mode 0 +php_flag zlib.output_compression Off +php_flag magic_quotes_gpc Off +php_flag magic_quotes_runtime Off +php_flag zend.ze1_compatibility_mode Off php_flag suhosin.session.encrypt Off php_value session.auto_start 0 diff --git a/roundcubemail/program/include/iniset.php b/roundcubemail/program/include/iniset.php index a58845366..1332c8d0e 100755 --- a/roundcubemail/program/include/iniset.php +++ b/roundcubemail/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/roundcubemail/program/steps/mail/get.inc b/roundcubemail/program/steps/mail/get.inc index 40ce14e09..cb938c08b 100644 --- a/roundcubemail/program/steps/mail/get.inc +++ b/roundcubemail/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; |