<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[12214] trunk: Check if $_SERVER['HTTP_ACCEPT_ENCODING']
is set before determining whether to compress scripts, props nacin,
fixes #11169</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12214">12214</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2009-11-19 09:46:07 +0000 (Thu, 19 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Check if $_SERVER['HTTP_ACCEPT_ENCODING'] is set before determining whether to compress scripts, props nacin, fixes <a href="http://trac.wordpress.org/ticket/11169">#11169</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminajaxphp">trunk/wp-admin/admin-ajax.php</a></li>
<li><a href="#trunkwpadminloadscriptsphp">trunk/wp-admin/load-scripts.php</a></li>
<li><a href="#trunkwpadminloadstylesphp">trunk/wp-admin/load-styles.php</a></li>
<li><a href="#trunkwpincludesjstinymcewptinymcephp">trunk/wp-includes/js/tinymce/wp-tinymce.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin-ajax.php (12213 => 12214)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-ajax.php 2009-11-19 09:12:16 UTC (rev 12213)
+++ trunk/wp-admin/admin-ajax.php 2009-11-19 09:46:07 UTC (rev 12214)
</span><span class="lines">@@ -91,6 +91,8 @@
</span><span class="cx"> echo $test_str;
</span><span class="cx"> die;
</span><span class="cx"> } elseif ( 2 == $_GET['test'] ) {
</span><ins>+ if ( !isset($_SERVER['HTTP_ACCEPT_ENCODING']) )
+ die('-1');
</ins><span class="cx"> if ( false !== strpos( strtolower($_SERVER['HTTP_ACCEPT_ENCODING']), 'deflate') && function_exists('gzdeflate') && ! $force_gzip ) {
</span><span class="cx"> header('Content-Encoding: deflate');
</span><span class="cx"> $out = gzdeflate( $test_str, 1 );
</span></span></pre></div>
<a id="trunkwpadminloadscriptsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/load-scripts.php (12213 => 12214)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/load-scripts.php 2009-11-19 09:12:16 UTC (rev 12213)
+++ trunk/wp-admin/load-scripts.php 2009-11-19 09:46:07 UTC (rev 12214)
</span><span class="lines">@@ -127,7 +127,7 @@
</span><span class="cx"> header('Expires: ' . gmdate( "D, d M Y H:i:s", time() + $expires_offset ) . ' GMT');
</span><span class="cx"> header("Cache-Control: public, max-age=$expires_offset");
</span><span class="cx">
</span><del>-if ( $compress && ! ini_get('zlib.output_compression') && 'ob_gzhandler' != ini_get('output_handler') ) {
</del><ins>+if ( $compress && ! ini_get('zlib.output_compression') && 'ob_gzhandler' != ini_get('output_handler') && isset($_SERVER['HTTP_ACCEPT_ENCODING']) ) {
</ins><span class="cx"> header('Vary: Accept-Encoding'); // Handle proxies
</span><span class="cx"> if ( false !== strpos( strtolower($_SERVER['HTTP_ACCEPT_ENCODING']), 'deflate') && function_exists('gzdeflate') && ! $force_gzip ) {
</span><span class="cx"> header('Content-Encoding: deflate');
</span></span></pre></div>
<a id="trunkwpadminloadstylesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/load-styles.php (12213 => 12214)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/load-styles.php 2009-11-19 09:12:16 UTC (rev 12213)
+++ trunk/wp-admin/load-styles.php 2009-11-19 09:46:07 UTC (rev 12214)
</span><span class="lines">@@ -137,7 +137,7 @@
</span><span class="cx"> header('Expires: ' . gmdate( "D, d M Y H:i:s", time() + $expires_offset ) . ' GMT');
</span><span class="cx"> header("Cache-Control: public, max-age=$expires_offset");
</span><span class="cx">
</span><del>-if ( $compress && ! ini_get('zlib.output_compression') && 'ob_gzhandler' != ini_get('output_handler') ) {
</del><ins>+if ( $compress && ! ini_get('zlib.output_compression') && 'ob_gzhandler' != ini_get('output_handler') && isset($_SERVER['HTTP_ACCEPT_ENCODING']) ) {
</ins><span class="cx"> header('Vary: Accept-Encoding'); // Handle proxies
</span><span class="cx"> if ( false !== strpos( strtolower($_SERVER['HTTP_ACCEPT_ENCODING']), 'deflate') && function_exists('gzdeflate') && ! $force_gzip ) {
</span><span class="cx"> header('Content-Encoding: deflate');
</span></span></pre></div>
<a id="trunkwpincludesjstinymcewptinymcephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/wp-tinymce.php (12213 => 12214)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/wp-tinymce.php 2009-11-19 09:12:16 UTC (rev 12213)
+++ trunk/wp-includes/js/tinymce/wp-tinymce.php 2009-11-19 09:46:07 UTC (rev 12214)
</span><span class="lines">@@ -1,4 +1,10 @@
</span><span class="cx"> <?php
</span><ins>+/**
+ * Disable error reporting
+ *
+ * Set this to error_reporting( E_ALL ) or error_reporting( E_ALL | E_STRICT ) for debugging
+ */
+error_reporting(0);
</ins><span class="cx">
</span><span class="cx"> $basepath = dirname(__FILE__);
</span><span class="cx">
</span><span class="lines">@@ -20,7 +26,9 @@
</span><span class="cx"> header('Expires: ' . gmdate( "D, d M Y H:i:s", time() + $expires_offset ) . ' GMT');
</span><span class="cx"> header("Cache-Control: public, max-age=$expires_offset");
</span><span class="cx">
</span><del>-if ( isset($_GET['c']) && 1 == $_GET['c'] && false !== strpos( strtolower($_SERVER['HTTP_ACCEPT_ENCODING']), 'gzip') && ( $file = get_file($basepath . '/wp-tinymce.js.gz') ) ) {
</del><ins>+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') ) ) {
+
</ins><span class="cx"> header('Content-Encoding: gzip');
</span><span class="cx"> echo $file;
</span><span class="cx"> } else {
</span></span></pre>
</div>
</div>
</body>
</html>