Changeset 12214

Timestamp:

11/19/09 09:46:07 (4 years ago)

Author:

azaozz

Message:

Check if $_SERVERHTTP_ACCEPT_ENCODING? is set before determining whether to compress scripts, props nacin, fixes #11169

Location:

trunk

Files:

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

trunk/wp-admin/admin-ajax.php

@@ -92 +92 @@
             die;
          } elseif ( 2 == $_GET['test'] ) {
+            if ( !isset($_SERVER['HTTP_ACCEPT_ENCODING']) )
+                die('-1');
             if ( false !== strpos( strtolower($_SERVER['HTTP_ACCEPT_ENCODING']), 'deflate') && function_exists('gzdeflate') && ! $force_gzip ) {
                 header('Content-Encoding: deflate');

trunk/wp-admin/load-scripts.php

@@ -128 +128 @@
 header("Cache-Control: public, max-age=$expires_offset");
 
-if ( $compress && ! ini_get('zlib.output_compression') && 'ob_gzhandler' != ini_get('output_handler') ) {
+if ( $compress && ! ini_get('zlib.output_compression') && 'ob_gzhandler' != ini_get('output_handler') && isset($_SERVER['HTTP_ACCEPT_ENCODING']) ) {
     header('Vary: Accept-Encoding'); // Handle proxies
     if ( false !== strpos( strtolower($_SERVER['HTTP_ACCEPT_ENCODING']), 'deflate') && function_exists('gzdeflate') && ! $force_gzip ) {

trunk/wp-admin/load-styles.php

@@ -138 +138 @@
 header("Cache-Control: public, max-age=$expires_offset");
 
-if ( $compress && ! ini_get('zlib.output_compression') && 'ob_gzhandler' != ini_get('output_handler') ) {
+if ( $compress && ! ini_get('zlib.output_compression') && 'ob_gzhandler' != ini_get('output_handler') && isset($_SERVER['HTTP_ACCEPT_ENCODING']) ) {
     header('Vary: Accept-Encoding'); // Handle proxies
     if ( false !== strpos( strtolower($_SERVER['HTTP_ACCEPT_ENCODING']), 'deflate') && function_exists('gzdeflate') && ! $force_gzip ) {

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

@@ -1 +1 @@
 <?php
+/**
+ * Disable error reporting
+ *
+ * Set this to error_reporting( E_ALL ) or error_reporting( E_ALL | E_STRICT ) for debugging
+ */
+error_reporting(0);
 
 $basepath = dirname(__FILE__);
@@ -21 +27 @@
 header("Cache-Control: public, max-age=$expires_offset");
 
-if ( isset($_GET['c']) && 1 == $_GET['c'] && false !== strpos( strtolower($_SERVER['HTTP_ACCEPT_ENCODING']), 'gzip') && ( $file = get_file($basepath . '/wp-tinymce.js.gz') ) ) {
+if ( isset($_GET['c']) && 1 == $_GET['c'] && isset($_SERVER['HTTP_ACCEPT_ENCODING'])
+    && false !== strpos( strtolower($_SERVER['HTTP_ACCEPT_ENCODING']), 'gzip') && ( $file = get_file($basepath . '/wp-tinymce.js.gz') ) ) {
+
     header('Content-Encoding: gzip');
     echo $file;