<!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>[13848] trunk/wp-includes/rss.php: Fix WP_HTTP ->
Snoopy Compat layer for Magpie RSS.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13848">13848</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-03-28 00:33:25 +0000 (Sun, 28 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix WP_HTTP -> Snoopy Compat layer for Magpie RSS. Fixes <a href="http://trac.wordpress.org/ticket/12045">#12045</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesrssphp">trunk/wp-includes/rss.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesrssphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/rss.php (13847 => 13848)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/rss.php 2010-03-28 00:23:40 UTC (rev 13847)
+++ trunk/wp-includes/rss.php 2010-03-28 00:33:25 UTC (rev 13848)
</span><span class="lines">@@ -540,7 +540,7 @@
</span><span class="cx"> * @param array $headers Optional. Headers to send to the URL.
</span><span class="cx"> * @return Snoopy style response
</span><span class="cx"> */
</span><del>-function _fetch_remote_file ($url, $headers = "" ) {
</del><ins>+function _fetch_remote_file($url, $headers = "" ) {
</ins><span class="cx"> $resp = wp_remote_request($url, array('headers' => $headers, 'timeout' => MAGPIE_FETCH_TIME_OUT));
</span><span class="cx"> if ( is_wp_error($resp) ) {
</span><span class="cx"> $error = array_shift($resp->errors);
</span><span class="lines">@@ -551,10 +551,23 @@
</span><span class="cx"> $resp->error = $error[0] . "\n"; //\n = Snoopy compatibility
</span><span class="cx"> return $resp;
</span><span class="cx"> }
</span><ins>+
+ // Snoopy returns headers unprocessed.
+ // Also note, WP_HTTP lowercases all keys, Snoopy did not.
+ $return_headers = array();
+ foreach ( $resp['headers'] as $key => $value ) {
+ if ( !is_array($value) ) {
+ $return_headers[] = "$key: $value";
+ } else {
+ foreach ( $value as $v )
+ $return_headers[] = "$key: $v";
+ }
+ }
+
</ins><span class="cx"> $response = new stdClass;
</span><span class="cx"> $response->status = $resp['response']['code'];
</span><span class="cx"> $response->response_code = $resp['response']['code'];
</span><del>- $response->headers = $resp['headers'];
</del><ins>+ $response->headers = $return_headers;
</ins><span class="cx"> $response->results = $resp['body'];
</span><span class="cx">
</span><span class="cx"> return $response;
</span><span class="lines">@@ -587,11 +600,11 @@
</span><span class="cx"> $val = "";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( $field == 'ETag' ) {
</del><ins>+ if ( $field == 'etag' ) {
</ins><span class="cx"> $rss->etag = $val;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( $field == 'Last-Modified' ) {
</del><ins>+ if ( $field == 'last-modified' ) {
</ins><span class="cx"> $rss->last_modified = $val;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>