summaryrefslogtreecommitdiffstats
path: root/lib/minimizer.php
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@owncloud.com>2012-11-14 12:53:36 +0100
committerArthur Schiwon <blizzz@owncloud.com>2012-11-15 10:35:34 +0100
commit4a75c539ed1786dbde1e79f547fbbb82942dcd00 (patch)
tree1cd99d5dc8dad16c11ec50cbd2f46755ca7b73a1 /lib/minimizer.php
parenta418a3ba65d0097047cfcad1b4ee82185c42d22a (diff)
downloadnextcloud-server-4a75c539ed1786dbde1e79f547fbbb82942dcd00.tar.gz
nextcloud-server-4a75c539ed1786dbde1e79f547fbbb82942dcd00.zip
Fix remote.php CSS+JS garbish on some systems
Diffstat (limited to 'lib/minimizer.php')
-rw-r--r--lib/minimizer.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/minimizer.php b/lib/minimizer.php
index 33106245963..db0c56f0f43 100644
--- a/lib/minimizer.php
+++ b/lib/minimizer.php
@@ -30,6 +30,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;