Changeset 9051

Timestamp:

10/02/2008 12:32:21 AM (16 years ago)

Author:

ryan

Message:

Error checking for HTTP requests. Props jacobsantos. see #7793

Location:

trunk

Files:

• wp-admin/update-links.php (modified) (1 diff)
• wp-includes/comment.php (modified) (1 diff)
• wp-includes/functions.php (modified) (4 diffs)

trunk/wp-admin/update-links.php

@@ -39 +39 @@
 $response = wp_remote_get('http://api.pingomatic.com/updated-batch/', $options);
 
+if ( is_wp_error( $response ) )
+    wp_die(__('Request Failed.'));
+
 if ( $response['response']['code'] != 200 )
     wp_die(__('Request Failed.'));

trunk/wp-includes/comment.php

@@ -1317 +1317 @@
     );
 
-    wp_remote_post($trackback_url, $options);
+    $response = wp_remote_post($trackback_url, $options);
+    
+    if ( is_wp_error( $response ) )
+        return;
 
     $tb_url = addslashes( $trackback_url );

trunk/wp-includes/functions.php

@@ -1040 +1040 @@
     $response = wp_remote_request($url, $options);
 
+    if ( is_wp_error( $response ) )
+        return false;
+
     $headers = wp_remote_retrieve_headers( $response );
     if ( false == $file_path )
@@ -1073 +1076 @@
 function wp_get_http_headers( $url, $deprecated = false ) {
     $response = wp_remote_head( $url );
+
+    if ( is_wp_error( $response ) )
+        return false;
+
     return wp_remote_retrieve_headers( $response );
 }
@@ -1241 +1248 @@
  *
  * @param string $uri URI/URL of web page to retrieve.
- * @return string HTTP content.
+ * @return bool|string HTTP content. False on failure.
  */
 function wp_remote_fopen( $uri ) {
-    // parse url() should not be used for validation of URLs.
-    // Keeping anyway, since the Filter extension is not available on all servers.
     $parsed_url = @parse_url( $uri );
 
@@ -1255 +1260 @@
 
     $response = wp_remote_get( $uri, $options );
+
+    if ( is_wp_error( $response ) )
+        return false;
 
     return $response['body'];