From 66343f977faf8185487be6a0e35d68d647c5cba7 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Wed, 14 Nov 2012 12:53:36 +0100 Subject: [PATCH 1/3] Fix remote.php CSS+JS garbish on some systems --- lib/minimizer.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/minimizer.php b/lib/minimizer.php index d50ab0d2397..79aede1704f 100644 --- a/lib/minimizer.php +++ b/lib/minimizer.php @@ -33,6 +33,12 @@ abstract class OC_Minimizer { $cache->set($cache_key.'.gz', $gzout); OC_Response::setETagHeader($etag); } + // on some systems (e.g. SLES 11, but not Ubuntu) mod_deflate and zlib compression will compress the output twice. + // This results in broken core.css and core.js. To avoid it, we switch off zlib compression. + // Since mod_deflate is still active, Apache will compress what needs to be compressed, i.e. no disadvantage. + if(function_exists('apache_setenv') && ini_get('zlib.output_compression')) { + ini_set('zlib.output_compression', 'Off'); + } if ($encoding = OC_Request::acceptGZip()) { header('Content-Encoding: '.$encoding); $out = $gzout; From 3fab16603a1640bc9a637c01003ddaa49065b659 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Wed, 14 Nov 2012 12:59:36 +0100 Subject: [PATCH 2/3] coding style --- lib/minimizer.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/minimizer.php b/lib/minimizer.php index 79aede1704f..779c08ea6e4 100644 --- a/lib/minimizer.php +++ b/lib/minimizer.php @@ -33,12 +33,12 @@ abstract class OC_Minimizer { $cache->set($cache_key.'.gz', $gzout); OC_Response::setETagHeader($etag); } - // on some systems (e.g. SLES 11, but not Ubuntu) mod_deflate and zlib compression will compress the output twice. + // on some systems (e.g. SLES 11, but not Ubuntu) mod_deflate and zlib compression will compress the output twice. // This results in broken core.css and core.js. To avoid it, we switch off zlib compression. // Since mod_deflate is still active, Apache will compress what needs to be compressed, i.e. no disadvantage. if(function_exists('apache_setenv') && ini_get('zlib.output_compression')) { - ini_set('zlib.output_compression', 'Off'); - } + ini_set('zlib.output_compression', 'Off'); + } if ($encoding = OC_Request::acceptGZip()) { header('Content-Encoding: '.$encoding); $out = $gzout; From 9b1f2462bf16581a635482a766e0909da1c43f82 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Wed, 14 Nov 2012 13:27:19 +0100 Subject: [PATCH 3/3] really check if mod_deflate is loaded --- lib/minimizer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/minimizer.php b/lib/minimizer.php index 779c08ea6e4..f77cd7fe504 100644 --- a/lib/minimizer.php +++ b/lib/minimizer.php @@ -36,7 +36,7 @@ abstract class OC_Minimizer { // on some systems (e.g. SLES 11, but not Ubuntu) mod_deflate and zlib compression will compress the output twice. // This results in broken core.css and core.js. To avoid it, we switch off zlib compression. // Since mod_deflate is still active, Apache will compress what needs to be compressed, i.e. no disadvantage. - if(function_exists('apache_setenv') && ini_get('zlib.output_compression')) { + if(function_exists('apache_get_modules') && ini_get('zlib.output_compression') && in_array('mod_deflate', apache_get_modules())) { ini_set('zlib.output_compression', 'Off'); } if ($encoding = OC_Request::acceptGZip()) {