Changeset 9553 for trunk/wp-includes/rss.php

Timestamp:

11/06/2008 07:06:43 PM (16 years ago)

Author:

ryan

Message:

Port Magpie from Snoopy to WP HTTP Request API. fixes #8082

File:

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

trunk/wp-includes/rss.php

@@ -385 +385 @@
 
 }
-require_once( dirname(__FILE__) . '/class-snoopy.php');
 
 if ( !function_exists('fetch_rss') ) :
@@ -527 +526 @@
 
 /**
- * Retrieve URL headers and content using Snoopy.
+ * Retrieve URL headers and content using WP HTTP Request API.
  *
  * @since unknown
@@ -535 +534 @@
  * @param string $url URL to retrieve
  * @param array $headers Optional. Headers to send to the URL.
- * @return Snoopy
+ * @return Snoopy style response
  */
 function _fetch_remote_file ($url, $headers = "" ) {
-    // Snoopy is an HTTP client in PHP
-    $client = new Snoopy();
-    $client->agent = apply_filters( 'magpie_user_agent', MAGPIE_USER_AGENT );
-    $client->read_timeout = MAGPIE_FETCH_TIME_OUT;
-    $client->use_gzip = MAGPIE_USE_GZIP;
-    if (is_array($headers) ) {
-        $client->rawheaders = $headers;
-    }
-
-    @$client->fetch($url);
-    return $client;
-
+    $resp = wp_remote_request($url, array('headers' => $headers, 'timeout' => MAGPIE_FETCH_TIME_OUT));
+    if ( is_wp_error($resp) ) {
+        $resp = new stdClass;
+        $resp->status = 500;
+        return $resp;
+    }
+    $response->status = $resp['response']['code'];
+    $response->headers = $resp['headers'];
+    $response->results = $resp['body'];
+
+    return $response;
 }