From e62f8c0eb94fdcdc41c40465c89af3bd7cff441d Mon Sep 17 00:00:00 2001 From: azaozz Date: Fri, 30 Jan 2009 13:45:05 +0000 Subject: [PATCH] Support output_handler = ob_gzhandler in script/style compressor, props DD32, fixes #9000 git-svn-id: http://svn.automattic.com/wordpress/trunk@10466 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/load-scripts.php | 4 ++-- wp-admin/load-styles.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wp-admin/load-scripts.php b/wp-admin/load-scripts.php index a409ad017..f2794899f 100644 --- a/wp-admin/load-scripts.php +++ b/wp-admin/load-scripts.php @@ -89,7 +89,7 @@ function get_file($path) { while ( @ob_end_clean() ); if ( isset($_GET['test']) && 1 == $_GET['test'] ) { - if ( ini_get('zlib.output_compression') ) + if ( ini_get('zlib.output_compression') || 'ob_gzhandler' == ini_get('output_handler') ) exit(''); $out = 'var wpCompressionTest = 1;'; @@ -143,7 +143,7 @@ header('Content-Type: application/x-javascript; charset=UTF-8'); header('Expires: ' . gmdate( "D, d M Y H:i:s", time() + $expires_offset ) . ' GMT'); header("Cache-Control: public, max-age=$expires_offset"); -if ( $compress && ! ini_get('zlib.output_compression') ) { +if ( $compress && ! ini_get('zlib.output_compression') && 'ob_gzhandler' != ini_get('output_handler') ) { header('Vary: Accept-Encoding'); // Handle proxies if ( false !== strpos( strtolower($_SERVER['HTTP_ACCEPT_ENCODING']), 'deflate') && function_exists('gzdeflate') && ! $force_gzip ) { header('Content-Encoding: deflate'); diff --git a/wp-admin/load-styles.php b/wp-admin/load-styles.php index 773ec945c..8cfd91515 100644 --- a/wp-admin/load-styles.php +++ b/wp-admin/load-styles.php @@ -127,7 +127,7 @@ header('Content-Type: text/css'); header('Expires: ' . gmdate( "D, d M Y H:i:s", time() + $expires_offset ) . ' GMT'); header("Cache-Control: public, max-age=$expires_offset"); -if ( $compress && ! ini_get('zlib.output_compression') ) { +if ( $compress && ! ini_get('zlib.output_compression') && 'ob_gzhandler' != ini_get('output_handler') ) { header('Vary: Accept-Encoding'); // Handle proxies if ( false !== strpos( strtolower($_SERVER['HTTP_ACCEPT_ENCODING']), 'deflate') && function_exists('gzdeflate') && ! $force_gzip ) { header('Content-Encoding: deflate');