<!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" />
<title>[25153] trunk/src/wp-includes/class-http.php: WP_HTTP: Improve WP_HTTP::chunkTransferDecode() to properly handle binary data and chunked responses which include data in the page that looks like a chunked response.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/25153">25153</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2013-08-28 06:52:09 +0000 (Wed, 28 Aug 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>WP_HTTP: Improve WP_HTTP::chunkTransferDecode() to properly handle binary data and chunked responses which include data in the page that looks like a chunked response.
This also fixes a case where the gzip'd data would become corrupt after chunked decoding as \r\n was replaced with \n in the data stream. Fixes <a href="http://core.trac.wordpress.org/ticket/23463">#23463</a> </pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasshttpphp">trunk/src/wp-includes/class-http.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasshttpphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/class-http.php (25152 => 25153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/class-http.php 2013-08-28 05:27:31 UTC (rev 25152)
+++ trunk/src/wp-includes/class-http.php 2013-08-28 06:52:09 UTC (rev 25153)
</span><span class="lines">@@ -459,12 +459,10 @@
</span><span class="cx"> /**
</span><span class="cx"> * Decodes chunk transfer-encoding, based off the HTTP 1.1 specification.
</span><span class="cx"> *
</span><del>- * Based off the HTTP http_encoding_dechunk function. Does not support UTF-8. Does not support
- * returning footer headers. Shouldn't be too difficult to support it though.
</del><ins>+ * Based off the HTTP http_encoding_dechunk function.
</ins><span class="cx"> *
</span><span class="cx"> * @link http://tools.ietf.org/html/rfc2616#section-19.4.6 Process for chunked decoding.
</span><span class="cx"> *
</span><del>- * @todo Add support for footer chunked headers.
</del><span class="cx"> * @access public
</span><span class="cx"> * @since 2.7.0
</span><span class="cx"> * @static
</span><span class="lines">@@ -472,35 +470,31 @@
</span><span class="cx"> * @param string $body Body content
</span><span class="cx"> * @return string Chunked decoded body on success or raw body on failure.
</span><span class="cx"> */
</span><del>- function chunkTransferDecode($body) {
- $body = str_replace(array("\r\n", "\r"), "\n", $body);
- // The body is not chunked encoding or is malformed.
- if ( ! preg_match( '/^[0-9a-f]+(\s|\n)+/mi', trim($body) ) )
</del><ins>+ public static function chunkTransferDecode( $body ) {
+ // The body is not chunked encoded or is malformed.
+ if ( ! preg_match( '/^([0-9a-f]+)[^\r\n]*\r\n/i', trim( $body ) ) )
</ins><span class="cx"> return $body;
</span><span class="cx">
</span><del>- $parsedBody = '';
- //$parsedHeaders = array(); Unsupported
</del><ins>+ $parsed_body = '';
+ $body_original = $body; // We'll be altering $body, so need a backup in case of error
</ins><span class="cx">
</span><span class="cx"> while ( true ) {
</span><del>- $hasChunk = (bool) preg_match( '/^([0-9a-f]+)(\s|\n)+/mi', $body, $match );
</del><ins>+ $has_chunk = (bool) preg_match( '/^([0-9a-f]+)[^\r\n]*\r\n/i', $body_copy, $match );
+ if ( ! $has_chunk || empty( $match[1] ) )
+ return $body_original;
</ins><span class="cx">
</span><del>- if ( $hasChunk ) {
- if ( empty( $match[1] ) )
- return $body;
</del><ins>+ $length = hexdec( $match[1] );
+ $chunk_length = strlen( $match[0] );
</ins><span class="cx">
</span><del>- $length = hexdec( $match[1] );
- $chunkLength = strlen( $match[0] );
</del><ins>+ // Parse out the chunk of data
+ $parsed_body .= substr( $body, $chunk_length, $length );
</ins><span class="cx">
</span><del>- $strBody = substr($body, $chunkLength, $length);
- $parsedBody .= $strBody;
</del><ins>+ // Remove the chunk from the raw data
+ $body = substr( $body, $length + $chunk_length );
</ins><span class="cx">
</span><del>- $body = ltrim(str_replace(array($match[0], $strBody), '', $body), "\n");
-
- if ( "0" == trim($body) )
- return $parsedBody; // Ignore footer headers.
- } else {
- return $body;
- }
</del><ins>+ // End of document
+ if ( '0' === trim( $body ) )
+ return $parsed_body;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>