Changeset 13848

Timestamp:

03/28/2010 12:33:25 AM (17 years ago)

Author:

dd32

Message:

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

File:

• trunk/wp-includes/rss.php (modified) (3 diffs)

trunk/wp-includes/rss.php

@@ -541 +541 @@
  * @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) ) {
@@ -552 +552 @@
                 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'];
 
@@ -588 +601 @@
                         }
 
-                        if ( $field == 'ETag' ) {
+                        if ( $field == 'etag' ) {
                                 $rss->etag = $val;
                         }
 
-                        if ( $field == 'Last-Modified' ) {
+                        if ( $field == 'last-modified' ) {
                                 $rss->last_modified = $val;
                         }