Changeset 10372

Timestamp:

01/17/2009 02:08:15 PM (16 years ago)

Author:

azaozz

Message:

Use gzip instead of deflate as more servers seem to understand it, add separate switch for disabling CSS compression

Location:

trunk

Files:

• wp-admin/load-scripts.php (modified) (3 diffs)
• wp-admin/load-styles.php (modified) (1 diff)
• wp-includes/js/tinymce/wp-tinymce.php (modified) (2 diffs)
• wp-includes/script-loader.php (modified) (6 diffs)

trunk/wp-admin/load-scripts.php

@@ -86 +86 @@
 }
 
+// Discard any buffers
+while ( @ob_end_clean() );
+
 if ( isset($_GET['test']) && 1 == $_GET['test'] ) {
     if ( ini_get('zlib.output_compression') )
         exit('');
-    
-    $out = 'var wpCompressionTest = 1;';
 
-    $compressed = false;
-    if ( false !== strpos( strtolower($_SERVER['HTTP_ACCEPT_ENCODING']), 'deflate') && function_exists('gzdeflate') ) {
-        header('Content-Encoding: deflate');
-        $out = gzdeflate( $out, 3 );
-        $compressed = true;
-    } elseif ( false !== strpos( strtolower($_SERVER['HTTP_ACCEPT_ENCODING']), 'gzip') && function_exists('gzencode') ) {
+    if ( false !== strpos( strtolower($_SERVER['HTTP_ACCEPT_ENCODING']), 'gzip') && function_exists('gzencode') ) {
         header('Content-Encoding: gzip');
-        $out = gzencode( $out, 3 );
-        $compressed = true;
+        $out = gzencode( 'var wpCompressionTest = 1;', 3 );
     }
     
-    if ( ! $compressed )
+    if ( ! isset($out) )
         exit('');
     
@@ -124 +119 @@
 require(ABSPATH . '/wp-includes/version.php');
 
-// Discard any buffers
-while ( @ob_end_clean() );
-
 $compress = ( isset($_GET['c']) && 1 == $_GET['c'] );
 $expires_offset = 31536000;
@@ -143 +135 @@
 
 header('Content-Type: application/x-javascript; charset=UTF-8');
-header('Vary: Accept-Encoding'); // Handle proxies
 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 ( false !== strpos( strtolower($_SERVER['HTTP_ACCEPT_ENCODING']), 'deflate') && function_exists('gzdeflate') ) {
-        header('Content-Encoding: deflate');
-        $out = gzdeflate( $out, 3 );
-    } elseif ( false !== strpos( strtolower($_SERVER['HTTP_ACCEPT_ENCODING']), 'gzip') && function_exists('gzencode') ) {
+if ( $compress && ! ini_get('zlib.output_compression') && function_exists('gzencode') ) {
+    header('Vary: Accept-Encoding'); // Handle proxies
+    if ( false !== strpos( strtolower($_SERVER['HTTP_ACCEPT_ENCODING']), 'gzip') ) {
         header('Content-Encoding: gzip');
         $out = gzencode( $out, 3 );

trunk/wp-admin/load-styles.php

@@ -124 +124 @@
 
 header('Content-Type: text/css');
-header('Vary: Accept-Encoding'); // Handle proxies
 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 ( false !== strpos( strtolower($_SERVER['HTTP_ACCEPT_ENCODING']), 'deflate') && function_exists('gzdeflate') ) {
-        header('Content-Encoding: deflate');
-        $out = gzdeflate( $out, 3 );
-    } elseif ( false !== strpos( strtolower($_SERVER['HTTP_ACCEPT_ENCODING']), 'gzip') && function_exists('gzencode') ) {
+if ( $compress && ! ini_get('zlib.output_compression') && function_exists('gzencode') ) {
+    header('Vary: Accept-Encoding'); // Handle proxies
+    if ( false !== strpos( strtolower($_SERVER['HTTP_ACCEPT_ENCODING']), 'gzip') ) {
         header('Content-Encoding: gzip');
         $out = gzencode( $out, 3 );

trunk/wp-includes/js/tinymce/wp-tinymce.php

@@ -1 +1 @@
 <?php
+
+$basepath = dirname(__FILE__);
 
 while ( @ob_end_clean() );
@@ -23 +25 @@
 if ( isset($_GET['c']) && 1 == $_GET['c'] && ! ini_get('zlib.output_compression') && false !== strpos( strtolower($_SERVER['HTTP_ACCEPT_ENCODING']), 'gzip') ) {
     header('Content-Encoding: gzip');
-    echo get_file('wp-tinymce.js.gz');
+    echo get_file($basepath . '/wp-tinymce.js.gz');
 } else {
-    echo get_file('wp-tinymce.js');
+    echo get_file($basepath . '/wp-tinymce.js');
 }
 exit;

trunk/wp-includes/script-loader.php

@@ -597 +597 @@
 
         $ver = md5("$wp_scripts->concat" . "$wp_scripts->concat_version");
-        $src = $wp_scripts->base_url . "/wp-admin/load-scripts.php?c={$zip}&load=" . rtrim($wp_scripts->concat, ',') . "&ver=$ver";
+        $src = $wp_scripts->base_url . "/wp-admin/load-scripts.php?c={$zip}&load=" . rtrim($wp_scripts->concat, ',') . "&ver=$ver";
         echo "<script type='text/javascript' src='$src'></script>\n";
     }
@@ -607 +607 @@
 
 function wp_print_admin_styles() {
-    global $wp_styles, $concatenate_scripts, $compress_scripts;
+    global $wp_styles, $concatenate_scripts, $compress_css;
 
     if ( !is_a($wp_styles, 'WP_Styles') )
@@ -616 +616 @@
 
     $wp_styles->do_concat = $concatenate_scripts;
-    $zip = $compress_scripts ? 1 : 0;
+    $zip = $compress_css ? 1 : 0;
 
     $wp_styles->do_items(false);
@@ -624 +624 @@
             $ver = md5("$wp_styles->concat" . "$wp_styles->concat_version");
             $rtl = 'rtl' === $wp_styles->text_direction ? 1 : 0;
-            $href = $wp_styles->base_url . "/wp-admin/load-styles.php?c={$zip}&amp;rtl={$rtl}&amp;load=" . rtrim($wp_styles->concat, ',') . "&amp;ver=$ver";
+            $href = $wp_styles->base_url . "/wp-admin/load-styles.php?c={$zip}&rtl={$rtl}&load=" . rtrim($wp_styles->concat, ',') . "&ver=$ver";
             echo "<link rel='stylesheet' href='$href' type='text/css' media='all' />\n";
         }
@@ -638 +638 @@
 
 function script_concat_settings() {
-    global $concatenate_scripts, $compress_scripts;
+    global $concatenate_scripts, $compress_scripts, $compress_css;
 
     $concatenate_scripts = defined('CONCATENATE_SCRIPTS') ? CONCATENATE_SCRIPTS : true;
@@ -647 +647 @@
     if ( $compress_scripts && ! get_option('can_compress_scripts') )
         $compress_scripts = false;
+
+    $compress_css = defined('COMPRESS_CSS') ? COMPRESS_CSS : true;
+    if ( $compress_css && ! get_option('can_compress_scripts') )
+        $compress_css = false;
 }