<!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>[13849] trunk/wp-includes/class-http.php:
Avoid notices for requests with no body.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13849">13849</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-03-28 00:56:43 +0000 (Sun, 28 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Avoid notices for requests with no body. Also fixes a few race conditions related to headers. Fixes <a href="http://trac.wordpress.org/ticket/11872">#11872</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesclasshttpphp">trunk/wp-includes/class-http.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesclasshttpphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-http.php (13848 => 13849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-http.php 2010-03-28 00:33:25 UTC (rev 13848)
+++ trunk/wp-includes/class-http.php 2010-03-28 00:56:43 UTC (rev 13849)
</span><span class="lines">@@ -392,8 +392,9 @@
</span><span class="cx"> * @return array Array with 'headers' and 'body' keys.
</span><span class="cx"> */
</span><span class="cx"> function processResponse($strResponse) {
</span><del>- list($theHeaders, $theBody) = explode("\r\n\r\n", $strResponse, 2);
- return array('headers' => $theHeaders, 'body' => $theBody);
</del><ins>+ $res = explode("\r\n\r\n", $strResponse, 2);
+
+ return array('headers' => isset($res[0]) ? $res[0] : array(), 'body' => isset($res[1]) ? $res[1] : '');
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -426,7 +427,7 @@
</span><span class="cx"> // If a redirection has taken place, The headers for each page request may have been passed.
</span><span class="cx"> // In this case, determine the final HTTP header and parse from there.
</span><span class="cx"> for ( $i = count($headers)-1; $i >= 0; $i-- ) {
</span><del>- if ( false === strpos($headers[$i], ':') ) {
</del><ins>+ if ( !empty($headers[$i]) && false === strpos($headers[$i], ':') ) {
</ins><span class="cx"> $headers = array_splice($headers, $i);
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -439,9 +440,7 @@
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> if ( false === strpos($tempheader, ':') ) {
</span><del>- list( , $iResponseCode, $strResponseMsg) = explode(' ', $tempheader, 3);
- $response['code'] = $iResponseCode;
- $response['message'] = $strResponseMsg;
</del><ins>+ list( , $response['code'], $response['message']) = explode(' ', $tempheader, 3);
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1228,7 +1227,11 @@
</span><span class="cx"> if ( ! $r['blocking'] )
</span><span class="cx"> return array( 'headers' => array(), 'body' => '', 'response' => array('code' => false, 'message' => false), 'cookies' => array() );
</span><span class="cx">
</span><del>- list($theHeaders, $theBody) = explode("\r\n\r\n", $strResponse, 2);
</del><ins>+ $headers_body = WP_HTTP::processResponse($strResponse);
+ $theHeaders = $headers_body['headers'];
+ $theBody = $headers_body['body'];
+ unset($headers_body);
+
</ins><span class="cx"> $theHeaders = WP_Http::processHeaders($theHeaders);
</span><span class="cx">
</span><span class="cx"> if ( ! empty( $theBody ) && isset( $theHeaders['headers']['transfer-encoding'] ) && 'chunked' == $theHeaders['headers']['transfer-encoding'] ) {
</span></span></pre>
</div>
</div>
</body>
</html>