[Pkg-owncloud-commits] [owncloud] 93/394: really check if mod_deflate is loaded

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag v4.5.10
in repository owncloud.

commit 9b1f2462bf16581a635482a766e0909da1c43f82
Author: Arthur Schiwon <blizzz at owncloud.com>
Date:   Wed Nov 14 13:27:19 2012 +0100

    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 779c08e..f77cd7f 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()) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git