From 45226eae666e4222337ffd71fed7cba6e65b7d3d Mon Sep 17 00:00:00 2001 From: Peter Westwood Date: Wed, 18 Jul 2007 21:12:22 +0000 Subject: [PATCH] Only enable gzip compression if it is not enabled in php.ini. Fixes #4426 git-svn-id: https://develop.svn.wordpress.org/trunk@5810 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-includes/functions.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/wp-includes/functions.php b/wp-includes/functions.php index 21b917a3d5..6a9123e0dd 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -394,10 +394,16 @@ function maybe_serialize($data) { } function gzip_compression() { - if ( !get_option('gzipcompression') ) return false; + if ( !get_option( 'gzipcompression' ) ) { + return false; + } - if ( extension_loaded('zlib') ) { - ob_start('ob_gzhandler'); + if ( ( ini_get( 'zlib.output_compression' ) == 'On' || ini_get( 'zlib.output_compression_level' ) > 0 ) || ini_get( 'output_handler' ) == 'ob_gzhandler' ) { + return false; + } + + if ( extension_loaded( 'zlib' ) ) { + ob_start( 'ob_gzhandler' ); } }