Changeset 10476 for trunk/wp-admin/load-scripts.php

Timestamp:

02/01/2009 09:45:24 AM (16 years ago)

Author:

azaozz

Message:

Detect when the server compresses output, see #8628

File:

• trunk/wp-admin/load-scripts.php (modified) (2 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') || 'ob_gzhandler' == ini_get('output_handler') )
-        exit('');
-
-    $out = 'var wpCompressionTest = 1;';
-    $force_gzip = ( isset($_GET['c']) && 'gzip' == $_GET['c'] );
-
-    if ( false !== strpos( strtolower($_SERVER['HTTP_ACCEPT_ENCODING']), 'deflate') && function_exists('gzdeflate') && ! $force_gzip ) {
-        header('Content-Encoding: deflate');
-        $out = gzdeflate( $out, 3 );
-    } elseif ( false !== strpos( strtolower($_SERVER['HTTP_ACCEPT_ENCODING']), 'gzip') && function_exists('gzencode') ) {
-        header('Content-Encoding: gzip');
-        $out = gzencode( $out, 3 );
-    } else {
-        exit('');
-    }
-
-    header( 'Expires: Wed, 11 Jan 1984 05:00:00 GMT' );
-    header( 'Last-Modified: ' . gmdate( 'D, d M Y H:i:s' ) . ' GMT' );
-    header( 'Cache-Control: no-cache, must-revalidate, max-age=0' );
-    header( 'Pragma: no-cache' );
-    header( 'Content-Type: application/x-javascript; charset=UTF-8' );
-    echo $out;
-    exit;
-}
-
-$load = preg_replace( '/[^a-z0-9,_-]*/i', '', $_GET['load'] );
+$load = preg_replace( '/[^a-z0-9,_-]+/i', '', $_GET['load'] );
 $load = explode(',', $load);
 
@@ -143 +114 @@
 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') && 'ob_gzhandler' != ini_get('output_handler') ) {
     header('Vary: Accept-Encoding'); // Handle proxies