Changeset 5810

Timestamp:

07/18/2007 09:12:22 PM (19 years ago)

Author:

westi

Message:

Only enable gzip compression if it is not enabled in php.ini. Fixes #4426

File:

• trunk/wp-includes/functions.php (modified) (1 diff)

trunk/wp-includes/functions.php

@@ -395 +395 @@
 
 function gzip_compression() {
-        if ( !get_option('gzipcompression') ) return false;
-
-        if ( extension_loaded('zlib') ) {
-                ob_start('ob_gzhandler');
+        if ( !get_option( 'gzipcompression' ) ) {
+                return false;
+        }
+
+        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' );
         }
 }