<!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>[12644] branches/2.9/wp-includes/http.php:
When decompressing try to raw-inflate first, props dd32,
fixes #11600 for 2.9</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12644">12644</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2010-01-07 10:55:23 +0000 (Thu, 07 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>When decompressing try to raw-inflate first, props dd32, fixes <a href="http://trac.wordpress.org/ticket/11600">#11600</a> for 2.9</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches29wpincludeshttpphp">branches/2.9/wp-includes/http.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches29wpincludeshttpphp"></a>
<div class="modfile"><h4>Modified: branches/2.9/wp-includes/http.php (12643 => 12644)</h4>
<pre class="diff"><span>
<span class="info">--- branches/2.9/wp-includes/http.php 2010-01-07 10:52:21 UTC (rev 12643)
+++ branches/2.9/wp-includes/http.php 2010-01-07 10:55:23 UTC (rev 12644)
</span><span class="lines">@@ -1816,18 +1816,18 @@
</span><span class="cx"> * @return string|bool False on failure.
</span><span class="cx"> */
</span><span class="cx"> function decompress( $compressed, $length = null ) {
</span><del>- $decompressed = WP_Http_Encoding::compatible_gzinflate( $compressed );
</del><span class="cx">
</span><del>- if ( false !== $decompressed )
</del><ins>+ if ( false !== ( $decompressed = @gzinflate( $compressed ) ) )
</ins><span class="cx"> return $decompressed;
</span><span class="cx">
</span><del>- $decompressed = gzuncompress( $compressed );
</del><ins>+ if ( false !== ( $decompressed = WP_Http_Encoding::compatible_gzinflate( $compressed ) ) )
+ return $decompressed;
</ins><span class="cx">
</span><del>- if ( false !== $decompressed )
</del><ins>+ if ( false !== ( $decompressed = @gzuncompress( $compressed ) ) )
</ins><span class="cx"> return $decompressed;
</span><span class="cx">
</span><span class="cx"> if ( function_exists('gzdecode') ) {
</span><del>- $decompressed = gzdecode( $compressed );
</del><ins>+ $decompressed = @gzdecode( $compressed );
</ins><span class="cx">
</span><span class="cx"> if ( false !== $decompressed )
</span><span class="cx"> return $decompressed;
</span><span class="lines">@@ -1916,7 +1916,7 @@
</span><span class="cx"> if ( is_array( $headers ) ) {
</span><span class="cx"> if ( array_key_exists('content-encoding', $headers) && ! empty( $headers['content-encoding'] ) )
</span><span class="cx"> return true;
</span><del>- } else if( is_string( $headers ) ) {
</del><ins>+ } else if ( is_string( $headers ) ) {
</ins><span class="cx"> return ( stripos($headers, 'content-encoding:') !== false );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>