Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix WP_HTTP -> Snoopy Compat layer for Magpie RSS. Fixes #12045 

git-svn-id: http://svn.automattic.com/wordpress/trunk@13848 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
dd32 2010-03-28 00:33:25 +00:00
parent 334670a67a
commit 5a42dae784
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
wp-includes/rss.php
View File

@ -540,7 +540,7 @@ endif;
* @param array $headers Optional. Headers to send to the URL.
* @return Snoopy style response
*/
function _fetch_remote_file ($url, $headers = "" ) {
function _fetch_remote_file($url, $headers = "" ) {
$resp = wp_remote_request($url, array('headers' => $headers, 'timeout' => MAGPIE_FETCH_TIME_OUT));
if ( is_wp_error($resp) ) {
$error = array_shift($resp->errors);
@ -551,10 +551,23 @@ function _fetch_remote_file ($url, $headers = "" ) {
$resp->error = $error[0] . "\n"; //\n = Snoopy compatibility
return $resp;
}
// 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";
}
}
$response = new stdClass;
$response->status = $resp['response']['code'];
$response->response_code = $resp['response']['code'];
$response->headers = $resp['headers'];
$response->headers = $return_headers;
$response->results = $resp['body'];
return $response;
@ -587,11 +600,11 @@ function _response_to_rss ($resp) {
$val = "";
}
if ( $field == 'ETag' ) {
if ( $field == 'etag' ) {
$rss->etag = $val;
}
if ( $field == 'Last-Modified' ) {
if ( $field == 'last-modified' ) {
$rss->last_modified = $val;
}
}