<!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>[17563] trunk/wp-includes/class-http.php: Correct logic for cURL Errors,
add extra sanity protection in ::
processHeaders to guard against null inputs.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17563">17563</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2011-03-26 03:32:05 +0000 (Sat, 26 Mar 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Correct logic for cURL Errors, add extra sanity protection in ::processHeaders to guard against null inputs. See <a href="http://trac.wordpress.org/ticket/16236">#16236</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 (17562 => 17563)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-http.php 2011-03-25 21:21:14 UTC (rev 17562)
+++ trunk/wp-includes/class-http.php 2011-03-26 03:32:05 UTC (rev 17563)
</span><span class="lines">@@ -359,7 +359,7 @@
</span><span class="cx">
</span><span class="cx"> $cookies = array();
</span><span class="cx"> $newheaders = array();
</span><del>- foreach ( $headers as $tempheader ) {
</del><ins>+ foreach ( (array) $headers as $tempheader ) {
</ins><span class="cx"> if ( empty($tempheader) )
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="lines">@@ -1121,7 +1121,7 @@
</span><span class="cx"> * @access private
</span><span class="cx"> * @var string
</span><span class="cx"> */
</span><del>- private $headers;
</del><ins>+ private $headers = '';
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Send a HTTP request to a URI using cURL extension.
</span><span class="lines">@@ -1259,7 +1259,7 @@
</span><span class="cx"> $theBody = $theResponse;
</span><span class="cx">
</span><span class="cx"> // If no response, and It's not a HEAD request with valid headers returned
</span><del>- if ( empty($theResponse) && 'HEAD' != $args['method'] && ! empty($this->headers) ) {
</del><ins>+ if ( empty($theResponse) && ('HEAD' != $args['method'] || empty($this->headers)) ) {
</ins><span class="cx"> if ( $curl_error = curl_error($handle) )
</span><span class="cx"> return new WP_Error('http_request_failed', $curl_error);
</span><span class="cx"> if ( in_array( curl_getinfo( $handle, CURLINFO_HTTP_CODE ), array(301, 302) ) )
</span></span></pre>
</div>
</div>
</body>
</html>