diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-06-01 07:21:14 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-06-01 07:21:14 +0000 |
| commit | 1596754b67a84823ef86b171faeae56aacc8560c (patch) | |
| tree | 4545801245a13dfc18c869cb6b879df5f679311c | |
| parent | 091eddb606d4af16c0102126ca65eb562eb54929 (diff) | |
- get rid of some hardcoded action names and move decission about output compression to the user
git-svn-id: https://svn.roundcube.net/trunk@2586 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/.htaccess | 2 | ||||
| -rw-r--r-- | roundcubemail/index.php | 14 | ||||
| -rw-r--r-- | roundcubemail/program/steps/mail/get.inc | 1 | ||||
| -rw-r--r-- | roundcubemail/program/steps/mail/viewsource.inc | 1 |
4 files changed, 5 insertions, 13 deletions
diff --git a/roundcubemail/.htaccess b/roundcubemail/.htaccess index 98c5fecaf..2d734690a 100644 --- a/roundcubemail/.htaccess +++ b/roundcubemail/.htaccess @@ -10,7 +10,7 @@ php_value upload_max_filesize 5M php_value post_max_size 6M php_value memory_limit 64M -php_value zlib.output_compression 0 +php_value zlib.output_compression 1 php_value magic_quotes_gpc 0 php_value zend.ze1_compatibility_mode 0 php_value suhosin.session.encrypt Off diff --git a/roundcubemail/index.php b/roundcubemail/index.php index 721aefc7c..0904f2be6 100644 --- a/roundcubemail/index.php +++ b/roundcubemail/index.php @@ -39,18 +39,8 @@ $OUTPUT = !empty($_REQUEST['_remote']) ? $RCMAIL->init_json() : $RCMAIL->load_gu // init plugin API $RCMAIL->plugins->init(); -// set output buffering -if ($RCMAIL->action != 'get' && $RCMAIL->action != 'viewsource') { - // use gzip compression if supported - if (function_exists('ob_gzhandler') - && !ini_get('zlib.output_compression') - && ini_get('output_handler') != 'ob_gzhandler') { - ob_start('ob_gzhandler'); - } - else { - ob_start(); - } -} +// turn on output buffering +ob_start(); // check if config files had errors if ($err_str = $RCMAIL->config->get_error()) { diff --git a/roundcubemail/program/steps/mail/get.inc b/roundcubemail/program/steps/mail/get.inc index d2863e8bc..cf66914d7 100644 --- a/roundcubemail/program/steps/mail/get.inc +++ b/roundcubemail/program/steps/mail/get.inc @@ -33,6 +33,7 @@ if (!empty($_GET['_preload'])) { exit; } +ob_end_clean(); // similar code as in program/steps/mail/show.inc if (!empty($_GET['_uid'])) { diff --git a/roundcubemail/program/steps/mail/viewsource.inc b/roundcubemail/program/steps/mail/viewsource.inc index 56a8ddec8..16d92c859 100644 --- a/roundcubemail/program/steps/mail/viewsource.inc +++ b/roundcubemail/program/steps/mail/viewsource.inc @@ -19,6 +19,7 @@ */ +ob_end_clean(); // similar code as in program/steps/mail/get.inc if ($uid = get_input_value('_uid', RCUBE_INPUT_GET)) |